diff --git a/.env.core b/.env.core
index f700eabff8..d9f8c3d41c 100644
--- a/.env.core
+++ b/.env.core
@@ -7,9 +7,9 @@ MOUNT_TYPE=-nfs
 ENABLE_PROGS=true
 ENABLE_B2B=false
 ENABLE_MKTG=true
-ENABLE_EDX=true
+ENABLE_EDX=false
 
-ENABLE_STATE_MANAGER=true
+ENABLE_STATE_MANAGER=false
 ENABLE_JUDGE=false
 ENABLE_ANALYTICS=false
 ENABLE_AUTH=false
diff --git a/provision.sh b/provision.sh
index 7cfbbf2e81..6cc12d16f3 100755
--- a/provision.sh
+++ b/provision.sh
@@ -49,11 +49,6 @@ docker exec -i edx.devstack.mongo mongosh < mongo-provision.js
 
 echo -e "MySQL ready"
 
-if $ENABLE_EDX; then
-  ./provision-lms.sh
-  # Nothing special needed for studio
-  docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d studio
-fi
 
 
 if $ENABLE_PROGS; then
@@ -81,3 +76,8 @@ fi
 docker image prune -f
 
 echo -e "${GREEN}Provisioning complete!${NC}"
+if $ENABLE_EDX; then
+  ./provision-lms.sh
+  # Nothing special needed for studio
+  docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d studio
+