diff --git a/api/Dockerfile b/api/Dockerfile
index df4244d02..8a6179233 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -1,9 +1,9 @@
-FROM flowdocker/play_builder:latest-java17 as builder
+FROM flowcommerce/play_builder_java17:latest as builder
 ADD . /opt/play
 WORKDIR /opt/play
 RUN sbt 'project api' clean stage
 
-FROM flowdocker/play:latest-java17
+FROM flowcommerce/play_java17:latest
 COPY --from=builder /opt/play /opt/play
 WORKDIR /opt/play/api/target/universal/stage
 ENTRYPOINT ["java", "-jar", "/root/environment-provider.jar", "--service", "play", "apibuilder-api", "bin/apibuilder-api"]
diff --git a/app/Dockerfile b/app/Dockerfile
index b0a613e32..240c7b1e2 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -1,9 +1,9 @@
-FROM flowdocker/play_builder:latest-java17 as builder
+FROM flowcommerce/play_builder_java17:latest as builder
 ADD . /opt/play
 WORKDIR /opt/play
 RUN sbt 'project app' clean stage
 
-FROM flowdocker/play:latest-java17
+FROM flowcommerce/play_java17:latest
 COPY --from=builder /opt/play /opt/play
 WORKDIR /opt/play/app/target/universal/stage
 ENTRYPOINT ["java", "-jar", "/root/environment-provider.jar", "--service", "play", "apibuilder-app", "bin/apibuilder-app"]