diff --git a/build/stacker-conformance.yaml b/build/stacker-conformance.yaml
index d81331c6..19620ef0 100644
--- a/build/stacker-conformance.yaml
+++ b/build/stacker-conformance.yaml
@@ -42,6 +42,8 @@ build:
   build_only: true
 
 "${{REPO_NAME:zot}}":
+  os: ${{OS}}
+  arch: ${{ARCH}}
   from:
     type: docker
     url: docker://gcr.io/distroless/base:latest-${{ARCH}}
diff --git a/build/stacker-zb.yaml b/build/stacker-zb.yaml
index 16183460..65a21f52 100644
--- a/build/stacker-zb.yaml
+++ b/build/stacker-zb.yaml
@@ -20,6 +20,8 @@ build:
   build_only: true
 
 "${{REPO_NAME:zb}}":
+  os: ${{OS}}
+  arch: ${{ARCH}}
   from:
     type: docker
     url: docker://gcr.io/distroless/base:latest-${{ARCH}}
diff --git a/build/stacker-zxp.yaml b/build/stacker-zxp.yaml
index 5df29665..2f428c84 100644
--- a/build/stacker-zxp.yaml
+++ b/build/stacker-zxp.yaml
@@ -40,6 +40,8 @@ build:
   build_only: true
 
 "${{REPO_NAME:zxp}}":
+  os: ${{OS}}
+  arch: ${{ARCH}}
   from:
     type: docker
     url: docker://gcr.io/distroless/base:latest-${{ARCH}}
diff --git a/build/stacker.yaml b/build/stacker.yaml
index c416cb09..279d23bf 100644
--- a/build/stacker.yaml
+++ b/build/stacker.yaml
@@ -41,6 +41,8 @@ build:
   build_only: true
 
 "${{REPO_NAME:zot}}":
+  os: ${{OS}}
+  arch: ${{ARCH}}
   from:
     type: docker
     url: docker://gcr.io/distroless/base:latest-${{ARCH}}