diff --git a/Dockerfile b/Dockerfile
index 8895927dc..f77982418 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 ### Dev Stage
-FROM openmrs/openmrs-core:2.6.1-dev as dev
+FROM openmrs/openmrs-core:dev as dev
 WORKDIR /openmrs_distro
 
 ARG MVN_ARGS_SETTINGS="-s /usr/share/maven/ref/settings-docker.xml -U"
@@ -25,7 +25,7 @@ RUN mvn clean $MVN_ARGS_SETTINGS
 
 ### Run Stage
 # Replace 'nightly' with the exact version of openmrs-core built for production (if available)
-FROM openmrs/openmrs-core:2.6.1
+FROM openmrs/openmrs-core:nightly
 
 # Do not copy the war if using the correct openmrs-core image version
 COPY --from=dev /openmrs/distribution/openmrs_core/openmrs.war /openmrs/distribution/openmrs_core/