diff --git a/awx/main/management/commands/create_preload_data.py b/awx/main/management/commands/create_preload_data.py
index 83cce691de..41fa665abf 100644
--- a/awx/main/management/commands/create_preload_data.py
+++ b/awx/main/management/commands/create_preload_data.py
@@ -2,9 +2,8 @@
 # All Rights Reserved
 
 from django.core.management.base import BaseCommand
-from django.conf import settings
 from crum import impersonate
-from awx.main.models import User, Organization, Project, Inventory, CredentialType, Credential, Host, JobTemplate, ExecutionEnvironment
+from awx.main.models import User, Organization, Project, Inventory, CredentialType, Credential, Host, JobTemplate
 from awx.main.signals import disable_computed_fields
 
 
@@ -68,13 +67,6 @@ class Command(BaseCommand):
                     print('Demo Credential, Inventory, and Job Template added.')
                     changed = True
 
-                for ee in reversed(settings.DEFAULT_EXECUTION_ENVIRONMENTS):
-                    _, created = ExecutionEnvironment.objects.update_or_create(name=ee['name'], defaults={'image': ee['image'], 'managed_by_tower': True})
-
-                if created:
-                    changed = True
-                    print('Default Execution Environment(s) registered.')
-
         if changed:
             print('(changed: True)')
         else:
diff --git a/awx/main/management/commands/register_default_execution_environments.py b/awx/main/management/commands/register_default_execution_environments.py
new file mode 100644
index 0000000000..67d101bba3
--- /dev/null
+++ b/awx/main/management/commands/register_default_execution_environments.py
@@ -0,0 +1,104 @@
+# Copyright (c) 2015 Ansible, Inc.
+# All Rights Reserved
+import sys
+from distutils.util import strtobool
+from argparse import RawTextHelpFormatter
+
+from django.core.management.base import BaseCommand
+from django.conf import settings
+from awx.main.models import CredentialType, Credential, ExecutionEnvironment
+
+
+class Command(BaseCommand):
+    """Create default execution environments, intended for new installs"""
+
+    help = """
+    Creates or updates the execution environments set in settings.DEFAULT_EXECUTION_ENVIRONMENTS if they are not yet created.
+    Optionally provide authentication details to create or update a container registry credential that will be set on all of these default execution environments.
+    Note that settings.DEFAULT_EXECUTION_ENVIRONMENTS is and ordered list, the first in the list will be used for project updates and system jobs.
+    """
+
+    # Preserves newlines in the help text
+    def create_parser(self, *args, **kwargs):
+        parser = super(Command, self).create_parser(*args, **kwargs)
+        parser.formatter_class = RawTextHelpFormatter
+        return parser
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "--registry-url",
+            type=str,
+            default="",
+            help="URL for the container registry",
+        )
+        parser.add_argument(
+            "--registry-username",
+            type=str,
+            default="",
+            help="username for the container registry",
+        )
+        parser.add_argument(
+            "--registry-password",
+            type=str,
+            default="",
+            help="Password or token for CLI authentication with the container registry",
+        )
+        parser.add_argument(
+            "--verify-ssl",
+            type=lambda x: bool(strtobool(str(x))),
+            default=True,
+            help="Verify SSL when authenticating with the container registry",
+        )
+
+    def handle(self, *args, **options):
+        changed = False
+        registry_cred = None
+
+        if options.get("registry_username"):
+            if not options.get("registry_password"):
+                sys.stderr.write("Registry password must be provided when providing registry username\n")
+                sys.exit(1)
+
+            if not options.get("registry_url"):
+                sys.stderr.write("Registry url must be provided when providing registry username\n")
+                sys.exit(1)
+
+            registry_cred_type = CredentialType.objects.filter(kind="registry")
+            if not registry_cred_type.exists():
+                sys.stderr.write("No registry credential type found")
+                sys.exit(1)
+
+            registry_cred, created = Credential.objects.get_or_create(
+                name="Default Execution Environment Registry Credential", managed_by_tower=True, credential_type=registry_cred_type[0]
+            )
+
+            if created:
+                print("Default Execution Environment Credential registered.")
+
+            inputs = {
+                "host": options.get("registry_url"),
+                "password": options.get("registry_password"),
+                "username": options.get("registry_username"),
+                "verify_ssl": options.get("verify_ssl"),
+            }
+
+            registry_cred.inputs = inputs
+            registry_cred.save()
+            changed = True
+
+            if not created:
+                print('Updated Default Execution Environment Credential')
+
+        for ee in reversed(settings.DEFAULT_EXECUTION_ENVIRONMENTS):
+            _, created = ExecutionEnvironment.objects.update_or_create(
+                name=ee["name"], defaults={"image": ee["image"], "managed_by_tower": True, "credential": registry_cred}
+            )
+
+        if created:
+            changed = True
+            print("Default Execution Environment(s) registered.")
+
+        if changed:
+            print("(changed: True)")
+        else:
+            print("(changed: False)")
diff --git a/tools/docker-compose/bootstrap_development.sh b/tools/docker-compose/bootstrap_development.sh
index 3f3cb586a3..1b2b1a29e9 100755
--- a/tools/docker-compose/bootstrap_development.sh
+++ b/tools/docker-compose/bootstrap_development.sh
@@ -29,6 +29,7 @@ if output=$(awx-manage createsuperuser --noinput --username=admin --email=admin@
     awx-manage update_password --username=admin --password=${admin_password}
 fi
 awx-manage create_preload_data
+awx-manage register_default_execution_environments
 
 mkdir -p /awx_devel/awx/public/static
 mkdir -p /awx_devel/awx/ui/static