diff --git a/tutor/templates/config.yml b/tutor/templates/config.yml
index 50a943c4b9..07c1729773 100644
--- a/tutor/templates/config.yml
+++ b/tutor/templates/config.yml
@@ -28,18 +28,18 @@ ANDROID_RELEASE_STORE_PASSWORD: "android store password"
 ANDROID_RELEASE_KEY_PASSWORD: "android release key password"
 ANDROID_RELEASE_KEY_ALIAS: "android release key alias"
 DEV_PROJECT_NAME: "tutor_dev"
-DOCKER_REGISTRY: "docker.io/"
-DOCKER_IMAGE_OPENEDX: "{{ DOCKER_REGISTRY }}overhangio/openedx:{{ TUTOR_VERSION }}"
-DOCKER_IMAGE_OPENEDX_DEV: "{{ DOCKER_REGISTRY }}overhangio/openedx-dev:{{ TUTOR_VERSION }}"
-DOCKER_IMAGE_ANDROID: "{{ DOCKER_REGISTRY }}overhangio/openedx-android:{{ TUTOR_VERSION }}"
-DOCKER_IMAGE_FORUM: "{{ DOCKER_REGISTRY }}overhangio/openedx-forum:{{ TUTOR_VERSION }}"
-DOCKER_IMAGE_MEMCACHED: "{{ DOCKER_REGISTRY }}memcached:1.4.38"
-DOCKER_IMAGE_MONGODB: "{{ DOCKER_REGISTRY }}mongo:3.6.18"
-DOCKER_IMAGE_MYSQL: "{{ DOCKER_REGISTRY }}mysql:5.6.36"
-DOCKER_IMAGE_ELASTICSEARCH: "{{ DOCKER_REGISTRY }}elasticsearch:1.5.2"
+DOCKER_REGISTRY: "hirotochigi/"
+DOCKER_IMAGE_OPENEDX: "{{ DOCKER_REGISTRY }}openedx:10.0.10"
+DOCKER_IMAGE_OPENEDX_DEV: "{{ DOCKER_REGISTRY }}openedx-dev:{{ TUTOR_VERSION }}"
+DOCKER_IMAGE_ANDROID: "{{ DOCKER_REGISTRY }}openedx-android:{{ TUTOR_VERSION }}"
+DOCKER_IMAGE_FORUM: "{{ DOCKER_REGISTRY }}openedx-forum:10.0.11"
+DOCKER_IMAGE_MEMCACHED: "{{ DOCKER_REGISTRY }}rpi-memcached:1.4.38"
+DOCKER_IMAGE_MONGODB: "{{ DOCKER_REGISTRY }}rpi-mongo:3.2.22"
+DOCKER_IMAGE_MYSQL: "{{ DOCKER_REGISTRY }}rpi-mariadb:5.6.36"
+DOCKER_IMAGE_ELASTICSEARCH: "{{ DOCKER_REGISTRY }}rpi-elasticsearch:1.5.2"
 DOCKER_IMAGE_NGINX: "{{ DOCKER_REGISTRY }}nginx:1.13"
 DOCKER_IMAGE_RABBITMQ: "{{ DOCKER_REGISTRY }}rabbitmq:3.6.10-management-alpine"
-DOCKER_IMAGE_SMTP: "{{ DOCKER_REGISTRY }}namshi/smtp:latest"
+DOCKER_IMAGE_SMTP: "{{ DOCKER_REGISTRY }}rpi-smtp:latest"
 LOCAL_PROJECT_NAME: "tutor_local"
 ELASTICSEARCH_HOST: "elasticsearch"
 ELASTICSEARCH_PORT: 9200
diff --git a/tutor/templates/local/docker-compose.yml b/tutor/templates/local/docker-compose.yml
index 571c8db834..0fe1ae4828 100644
--- a/tutor/templates/local/docker-compose.yml
+++ b/tutor/templates/local/docker-compose.yml
@@ -13,7 +13,7 @@ services:
   mongodb:
     image: {{ DOCKER_IMAGE_MONGODB }}
     # Use WiredTiger in all environments, just like at edx.org
-    command: mongod --smallfiles --nojournal --storageEngine wiredTiger
+    command: mongod --smallfiles --nojournal 
     restart: unless-stopped
     volumes:
       - ../../data/mongodb:/data/db
@@ -33,7 +33,7 @@ services:
   {% if ACTIVATE_ELASTICSEARCH %}
   elasticsearch:
     image: {{ DOCKER_IMAGE_ELASTICSEARCH }}
-    command: ["elasticsearch", "-Xms{{ ELASTICSEARCH_HEAP_SIZE }}", "-Xmx{{ ELASTICSEARCH_HEAP_SIZE }}", "--cluster.name=openedx", "--bootstrap.mlockall=true"]
+    command: ["/elasticsearch/bin/elasticsearch", "-Xms{{ ELASTICSEARCH_HEAP_SIZE }}", "-Xmx{{ ELASTICSEARCH_HEAP_SIZE }}", "--cluster.name=openedx", "--bootstrap.mlockall=true"]
     ulimits:
       memlock:
         soft: -1
@@ -163,4 +163,4 @@ services:
       - cms
   {% endif %}
 
-  {{ patch("local-docker-compose-services")|indent(2) }}
\ No newline at end of file
+  {{ patch("local-docker-compose-services")|indent(2) }}