diff --git a/.env b/.env
index 72d4e80..d9005b5 100644
--- a/.env
+++ b/.env
@@ -32,7 +32,7 @@ SPA_CONFIG_URLS=/openmrs/spa/configs/ozone-frontend-config.json
 SPA_DEFAULT_LOCALE=en
 
 # OpenMRS frontend and backend Docker image tag
-O3_DOCKER_IMAGE_TAG=3.1.1
+O3_DOCKER_IMAGE_TAG=
 
 #
 # MySQL
diff --git a/docker-compose-openmrs.yml b/docker-compose-openmrs.yml
index c4141cd..1c0674f 100644
--- a/docker-compose-openmrs.yml
+++ b/docker-compose-openmrs.yml
@@ -23,7 +23,7 @@ services:
       timeout: 5s
       retries: 48
       start_period: 120s
-    image: openmrs/openmrs-core:2.6.7
+    image: openmrs/nightly-amazoncorretto-11
     labels:
       traefik.enable: "true"
       traefik.http.routers.openmrs.rule: "Host(`${O3_HOSTNAME}`) && PathPrefix(`/openmrs`)"