diff --git a/.github/workflows/containerize.yaml b/.github/workflows/containerize.yaml
index b195c70..596baf9 100644
--- a/.github/workflows/containerize.yaml
+++ b/.github/workflows/containerize.yaml
@@ -17,7 +17,7 @@ on:
     paths:
       - "intent_brokering/src/**"
       - "intent_brokering/proto/**"
-      - "Dockerfile.intent_brokering"
+      - "Dockerfile.intent_brokering.amd64"
       - ".github/workflows/containerize.yaml"
       - "rust-toolchain.toml"
 
diff --git a/.github/workflows/e2e-ci.yml b/.github/workflows/e2e-ci.yml
index 1fabd77..f1e31e5 100644
--- a/.github/workflows/e2e-ci.yml
+++ b/.github/workflows/e2e-ci.yml
@@ -50,7 +50,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
-          file: ./Dockerfile.intent_brokering
+          file: ./Dockerfile.intent_brokering.amd64
           load: true
           tags: intent_brokering:1
 
diff --git a/.github/workflows/lt-ci.yml b/.github/workflows/lt-ci.yml
index 2f17f72..131ae30 100644
--- a/.github/workflows/lt-ci.yml
+++ b/.github/workflows/lt-ci.yml
@@ -57,7 +57,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
-          file: Dockerfile.intent_brokering
+          file: Dockerfile.intent_brokering.amd64
           load: true
           tags: intent_brokering:1
 
diff --git a/Dockerfile.service_discovery.arm64 b/Dockerfile.service_discovery.arm64
index f293cd0..124e92f 100644
--- a/Dockerfile.service_discovery.arm64
+++ b/Dockerfile.service_discovery.arm64
@@ -22,11 +22,11 @@ WORKDIR /sdv
 
 COPY ./ .
 
-# Check that UID argument is valid.
+# Check that CHARIOTT_UID argument is valid.
 RUN /sdv/container/scripts/argument_sanitizer.sh \
-    --arg-value "${UID}" \
+    --arg-value "${CHARIOTT_UID}" \
     --regex "^[0-9]+$" || \
-    ( echo "Argument sanitizer failed for ARG 'UID'"; exit 1 )
+    ( echo "Argument sanitizer failed for ARG 'CHARIOTT_UID'"; exit 1 )
 
 # unprivileged identity to run Chariott Service Discovery as
 RUN adduser \