diff --git a/docker/distroless/Dockerfile.msopenjdk-11-jdk b/docker/distroless/Dockerfile.msopenjdk-11-jdk
index d0c0011..5779576 100644
--- a/docker/distroless/Dockerfile.msopenjdk-11-jdk
+++ b/docker/distroless/Dockerfile.msopenjdk-11-jdk
@@ -3,7 +3,7 @@ ARG INSTALLER_TAG="2.0"
 ARG BASE_IMAGE="mcr.microsoft.com/cbl-mariner/distroless/base"
 ARG BASE_TAG="2.0"
 
-FROM ${INSTALLER_IMAGE}:${INSTALLER_TAG} AS installer
+FROM $INSTALLER_IMAGE:$INSTALLER_TAG AS installer
 
 ARG JDK_URL="https://aka.ms/download-jdk/microsoft-jdk-11-linux-x64.tar.gz"
 
@@ -38,7 +38,7 @@ RUN rm -rf /staging/etc/dnf \
 # Clean up JDK
 RUN rm -rf /usr/jdk/man /usr/jdk/lib/src.zip
 
-FROM ${BASE_IMAGE}:${BASE_TAG}
+FROM $BASE_IMAGE:$BASE_TAG
 
 LABEL "Author"="Microsoft"
 LABEL "Support"="Microsoft OpenJDK Support <openjdk-support@microsoft.com>"
diff --git a/docker/distroless/Dockerfile.msopenjdk-17-jdk b/docker/distroless/Dockerfile.msopenjdk-17-jdk
index 0d3127e..ac2f60d 100644
--- a/docker/distroless/Dockerfile.msopenjdk-17-jdk
+++ b/docker/distroless/Dockerfile.msopenjdk-17-jdk
@@ -3,7 +3,7 @@ ARG INSTALLER_TAG="2.0"
 ARG BASE_IMAGE="mcr.microsoft.com/cbl-mariner/distroless/base"
 ARG BASE_TAG="2.0"
 
-FROM ${INSTALLER_IMAGE}:${INSTALLER_TAG} AS installer
+FROM $INSTALLER_IMAGE:$INSTALLER_TAG AS installer
 
 ARG JDK_URL="https://aka.ms/download-jdk/microsoft-jdk-17-linux-x64.tar.gz"
 
@@ -38,7 +38,7 @@ RUN rm -rf /staging/etc/dnf \
 # Clean up JDK
 RUN rm -rf /usr/jdk/man /usr/jdk/lib/src.zip
 
-FROM ${BASE_IMAGE}:${BASE_TAG}
+FROM $BASE_IMAGE:$BASE_TAG
 
 LABEL "Author"="Microsoft"
 LABEL "Support"="Microsoft OpenJDK Support <openjdk-support@microsoft.com>"
diff --git a/docker/distroless/Dockerfile.temurin-8-jdk b/docker/distroless/Dockerfile.temurin-8-jdk
index 7cceb24..15783aa 100644
--- a/docker/distroless/Dockerfile.temurin-8-jdk
+++ b/docker/distroless/Dockerfile.temurin-8-jdk
@@ -3,7 +3,7 @@ ARG INSTALLER_TAG="2.0"
 ARG BASE_IMAGE="mcr.microsoft.com/cbl-mariner/distroless/base"
 ARG BASE_TAG="2.0"
 
-FROM ${INSTALLER_IMAGE}:${INSTALLER_TAG} AS installer
+FROM $INSTALLER_IMAGE:$INSTALLER_TAG AS installer
 
 ARG PKGS="ca-certificates tzdata freetype"
 ARG JDK_URL="https://api.adoptium.net/v3/binary/latest/8/ga/linux/x64/jdk/hotspot/normal/eclipse?project=jdk"
@@ -27,7 +27,7 @@ RUN mkdir /staging \
    && cp /etc/passwd /staging/etc/passwd \
    && cp /etc/group /staging/etc/group
 
-FROM ${BASE_IMAGE}:${BASE_TAG}
+FROM $BASE_IMAGE:$BASE_TAG
 
 LABEL "Author"="Microsoft"
 LABEL "Support"="Microsoft OpenJDK Support <openjdk-support@microsoft.com>"
diff --git a/docker/mariner-cm1/Dockerfile.msopenjdk-11-jdk b/docker/mariner-cm1/Dockerfile.msopenjdk-11-jdk
index 8f13f19..2fa9a34 100644
--- a/docker/mariner-cm1/Dockerfile.msopenjdk-11-jdk
+++ b/docker/mariner-cm1/Dockerfile.msopenjdk-11-jdk
@@ -1,6 +1,6 @@
 ARG IMAGE="mcr.microsoft.com/cbl-mariner/base/core"
 ARG TAG="1.0"
-FROM ${IMAGE}:${TAG}
+FROM $IMAGE:$TAG
 
 LABEL "Author"="Microsoft"
 LABEL "Support"="Microsoft OpenJDK Support <openjdk-support@microsoft.com>"
diff --git a/docker/mariner-cm1/Dockerfile.msopenjdk-17-jdk b/docker/mariner-cm1/Dockerfile.msopenjdk-17-jdk
index 369056f..f48d770 100644
--- a/docker/mariner-cm1/Dockerfile.msopenjdk-17-jdk
+++ b/docker/mariner-cm1/Dockerfile.msopenjdk-17-jdk
@@ -1,6 +1,6 @@
 ARG IMAGE="mcr.microsoft.com/cbl-mariner/base/core"
 ARG TAG="1.0"
-FROM ${IMAGE}:${TAG}
+FROM $IMAGE:$TAG
 
 LABEL "Author"="Microsoft"
 LABEL "Support"="Microsoft OpenJDK Support <openjdk-support@microsoft.com>"
diff --git a/docker/mariner/Dockerfile.msopenjdk-11-jdk b/docker/mariner/Dockerfile.msopenjdk-11-jdk
index d94db59..64de50b 100644
--- a/docker/mariner/Dockerfile.msopenjdk-11-jdk
+++ b/docker/mariner/Dockerfile.msopenjdk-11-jdk
@@ -1,6 +1,6 @@
 ARG IMAGE="mcr.microsoft.com/cbl-mariner/base/core"
 ARG TAG="2.0"
-FROM ${IMAGE}:${TAG}
+FROM $IMAGE:$TAG
 
 LABEL "Author"="Microsoft"
 LABEL "Support"="Microsoft OpenJDK Support <openjdk-support@microsoft.com>"
diff --git a/docker/mariner/Dockerfile.msopenjdk-17-jdk b/docker/mariner/Dockerfile.msopenjdk-17-jdk
index e6edf89..0424207 100644
--- a/docker/mariner/Dockerfile.msopenjdk-17-jdk
+++ b/docker/mariner/Dockerfile.msopenjdk-17-jdk
@@ -1,6 +1,6 @@
 ARG IMAGE="mcr.microsoft.com/cbl-mariner/base/core"
 ARG TAG="2.0"
-FROM ${IMAGE}:${TAG}
+FROM $IMAGE:$TAG
 
 LABEL "Author"="Microsoft"
 LABEL "Support"="Microsoft OpenJDK Support <openjdk-support@microsoft.com>"
diff --git a/docker/mariner/Dockerfile.temurin-8-jdk b/docker/mariner/Dockerfile.temurin-8-jdk
index 0d74450..220465b 100644
--- a/docker/mariner/Dockerfile.temurin-8-jdk
+++ b/docker/mariner/Dockerfile.temurin-8-jdk
@@ -1,6 +1,6 @@
 ARG IMAGE="mcr.microsoft.com/cbl-mariner/base/core"
 ARG TAG="2.0"
-FROM ${IMAGE}:${TAG}
+FROM $IMAGE:$TAG
 
 LABEL "Author"="Microsoft"
 LABEL "Support"="Microsoft OpenJDK Support <openjdk-support@microsoft.com>"