diff --git a/Makefile b/Makefile
index 0ce41f8e61..0ed89619dd 100644
--- a/Makefile
+++ b/Makefile
@@ -407,8 +407,8 @@ dev.shell.analyticsapi:
 dev.shell.insights:
 	docker compose exec insights env TERM=$(TERM) bash -c 'eval $$(source /edx/app/insights/insights_env; echo PATH="$$PATH";) && /bin/bash'
 
-dev.shell.enterprise_catalog:
-	docker exec -it edx.devstack.enterprise.catalog env TERM=$(TERM) bash -c '/bin/bash'
+dev.shell.enterprise-catalog:
+	docker exec -it edx.devstack.enterprise-catalog env TERM=$(TERM) bash -c '/bin/bash'
 
 dev.shell.%: ## Run a shell on the specified service's container.
 	docker compose exec $* /bin/bash
diff --git a/docker-compose.yml b/docker-compose.yml
index 522aee0303..8846b5dc14 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -695,8 +695,8 @@ services:
 
   enterprise-catalog:
     image: edxops/enterprise-catalog-dev
-    container_name: edx.devstack.enterprise.catalog
-    hostname: edx.devstack.enterprise.catalog
+    container_name: edx.devstack.enterprise-catalog
+    hostname: enterprise-catalog.devstack.edx
     command: bash -c 'while true; do python /edx/app/enterprise_catalog/enterprise_catalog/manage.py runserver 0.0.0.0:18160; sleep 2; done'
     ports:
       - "18160:18160"
diff --git a/options.mk b/options.mk
index a5adeb6d68..ad7449435b 100644
--- a/options.mk
+++ b/options.mk
@@ -67,7 +67,7 @@ credentials+discovery+ecommerce+edx_notes_api+forum+frontend-app-authn+frontend-
 # Separated by plus signs.
 # Separated by plus signs. Listed in alphabetical order for clarity.
 EDX_SERVICES ?= \
-analyticsapi+credentials+cms+cms-worker+cms_watcher+discovery+ecommerce+edx_notes_api+forum+frontend-app-account+frontend-app-learner-dashboard+frontend-app-learner-record+frontend-app-profile+frontend-app-authn+frontend-app-course-authoring+frontend-app-gradebook+frontend-app-ora-grading+frontend-app-learning+frontend-app-library-authoring+frontend-app-payment+frontend-app-program-console+frontend-app-publisher+insights+lms+lms-worker+lms_watcher+registrar+registrar-worker+xqueue+xqueue_consumer+enterprise_catalog
+analyticsapi+credentials+cms+cms-worker+cms_watcher+discovery+ecommerce+edx_notes_api+forum+frontend-app-account+frontend-app-learner-dashboard+frontend-app-learner-record+frontend-app-profile+frontend-app-authn+frontend-app-course-authoring+frontend-app-gradebook+frontend-app-ora-grading+frontend-app-learning+frontend-app-library-authoring+frontend-app-payment+frontend-app-program-console+frontend-app-publisher+insights+lms+lms-worker+lms_watcher+registrar+registrar-worker+xqueue+xqueue_consumer+enterprise-catalog
 
 # Services with database migrations.
 # Should be a subset of $(EDX_SERVICES).
diff --git a/provision-enterprise_catalog.sh b/provision-enterprise_catalog.sh
index 820609d02d..59dfb85984 100755
--- a/provision-enterprise_catalog.sh
+++ b/provision-enterprise_catalog.sh
@@ -1,16 +1,7 @@
-name="enterprise_catalog"
+name="enterprise-catalog"
 port="18160"
 
-docker-compose up -d
-
-# Wait for MySQL
-echo "Waiting for MySQL"
-until docker exec -i enterprise.catalog.mysql mysql -u root -se "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')" &> /dev/null
-do
-  printf "."
-  sleep 1
-done
-sleep 5
+docker compose up -d $name
 
 # Run migrations
 echo -e "${GREEN}Running migrations for ${name}...${NC}"
diff --git a/provision.sh b/provision.sh
index 252a17175d..551349ed68 100755
--- a/provision.sh
+++ b/provision.sh
@@ -49,7 +49,7 @@ xqueue \
 coursegraph \
 insights \
 analyticsapi \
-enterprise_catalog \
+enterprise-catalog \
  "
 
 # What should we provision?