diff --git a/Docker/Dockerfile-ORE b/Docker/Dockerfile-ORE
index 65d436abd..19654b0e0 100644
--- a/Docker/Dockerfile-ORE
+++ b/Docker/Dockerfile-ORE
@@ -1,6 +1,8 @@
 # syntax = docker/dockerfile:1.2
+ARG DOCKER_REPO
+ARG DEBIAN_TAG
 ARG ORE_BUILD_VERSION
-FROM ${DOCKER_REPO}ore-build-dependencies:${ORE_BUILD_VERSION} as orebuild
+FROM ${DOCKER_REPO}ore-build-dependencies:${ORE_BUILD_VERSION} AS orebuild
 
 LABEL Quaternion Risk Management
 LABEL Description="Build ORE"
diff --git a/Docker/Dockerfile-ORE-App b/Docker/Dockerfile-ORE-App
index f2351dd51..b60303951 100644
--- a/Docker/Dockerfile-ORE-App
+++ b/Docker/Dockerfile-ORE-App
@@ -1,9 +1,10 @@
 #ARG TEST_TAG=latest
 ARG CMAKE_BUILD_TYPE=Release
+ARG DOCKER_REPO
 ARG ORE_HELPER_VERSION
 ARG ORE_VERSION
 
-FROM ${DOCKER_REPO}env_ore:${ORE_VERSION} as env_ore
+FROM ${DOCKER_REPO}env_ore:${ORE_VERSION} AS env_ore
 FROM ${DOCKER_REPO}ore-helper:${ORE_HELPER_VERSION}
 
 RUN mkdir -p /ore/App
diff --git a/Docker/Dockerfile-ORE-Dependencies b/Docker/Dockerfile-ORE-Dependencies
index 02c28c464..62bb1c81e 100644
--- a/Docker/Dockerfile-ORE-Dependencies
+++ b/Docker/Dockerfile-ORE-Dependencies
@@ -1,6 +1,7 @@
 # syntax = docker/dockerfile:1.2
+ARG DOCKER_REPO
 ARG DEBIAN_TAG
-FROM ${DOCKER_TAG}debian:${DEBIAN_TAG}
+FROM ${DOCKER_REPO}debian:${DEBIAN_TAG}
 
 RUN apt-get update \
   && DEBIAN_FRONTEND=noninteractive \
diff --git a/Docker/docker-compose-ore-app.yml b/Docker/docker-compose-ore-app.yml
index 0db94556e..08e00de23 100644
--- a/Docker/docker-compose-ore-app.yml
+++ b/Docker/docker-compose-ore-app.yml
@@ -9,5 +9,6 @@ services:
       context: ../
       dockerfile: Docker/Dockerfile-ORE-App
       args:
+        - DEBIAN_TAG=${DEBIAN_TAG}
         - ORE_VERSION=${ORE_TAG}
         - ORE_HELPER_VERSION=${ORE_HELPER_VERSION}