diff --git a/Makefile b/Makefile
index fe56fb64a4..78db1444a6 100644
--- a/Makefile
+++ b/Makefile
@@ -445,10 +445,10 @@ dev.shell.lms_watcher:
 	docker-compose exec lms_watcher env TERM=$(TERM) /edx/app/edxapp/devstack.sh open
 
 dev.shell.studio:
-	docker-compose exec studio env TERM=$(TERM) /edx/app/edxapp/devstack.sh open
+	docker-compose exec studio env TERM=$(TERM) bash -c '/bin/bash'
 
 dev.shell.studio_watcher:
-	docker-compose exec studio_watcher env TERM=$(TERM) /edx/app/edxapp/devstack.sh open
+	docker-compose exec studio_watcher env TERM=$(TERM) bash -c '/bin/bash'
 
 dev.shell.xqueue_consumer:
 	docker-compose exec xqueue_consumer env TERM=$(TERM) /edx/app/xqueue/devstack.sh open
diff --git a/docker-compose-watchers.yml b/docker-compose-watchers.yml
index 45d3610708..3b8526675f 100644
--- a/docker-compose-watchers.yml
+++ b/docker-compose-watchers.yml
@@ -25,7 +25,7 @@ services:
     environment:
       BOK_CHOY_HOSTNAME: edx.devstack.studio_watcher
       ASSET_WATCHER_TIMEOUT: 12
-    image: edxops/edxapp:${OPENEDX_RELEASE:-latest}
+    image: openedx/lms-dev:${OPENEDX_RELEASE:-latest}
     volumes:
       - edxapp_studio_assets:/edx/var/edxapp/staticfiles/
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform
diff --git a/docker-compose.yml b/docker-compose.yml
index 99c83c082d..4e4e1aba63 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -622,7 +622,7 @@ services:
       DJANGO_WATCHMAN_TIMEOUT: 30
       LMS_CFG: "/edx/etc/lms.yml"
       CMS_CFG: "/edx/etc/studio.yml"
-    image: edxops/edxapp:${OPENEDX_RELEASE:-latest}
+    image: openedx/lms-dev:${OPENEDX_RELEASE:-latest}
     networks:
       default:
         aliases: