diff --git a/ci_images/dnf_wrapper.sh b/ci_images/dnf_wrapper.sh
index 55c8185ffa..11e56e271d 100755
--- a/ci_images/dnf_wrapper.sh
+++ b/ci_images/dnf_wrapper.sh
@@ -118,4 +118,4 @@ if ls "${ART_REPOS_PREFIX}"* 1> /dev/null 2>&1; then
   EXTRA_DNF_ARGS="--disableplugin=subscription-manager"
 fi
 
-$0.real "${EXTRA_DNF_ARGS}" "$@"
+$0.real ${EXTRA_DNF_ARGS} "$@"
diff --git a/ci_images/rhel-8/ci-openshift-build-root/Dockerfile b/ci_images/rhel-8/ci-openshift-build-root/Dockerfile
index 806ad983bd..2f5e1c7ce2 100644
--- a/ci_images/rhel-8/ci-openshift-build-root/Dockerfile
+++ b/ci_images/rhel-8/ci-openshift-build-root/Dockerfile
@@ -68,3 +68,8 @@ RUN mkdir -p $GOPATH && \
 # Some image building tools don't create a missing WORKDIR
 RUN mkdir -p /go/src/github.com/openshift/origin
 WORKDIR /go/src/github.com/openshift/origin
+
+# These services run on the build farms and serve RPMs to CI workloads.
+# This environment variable is used by dnf_wrapper.sh to know which service
+# to acquire repo information from.
+ENV CI_RPM_SVC=base-MAJOR-MINOR-rhelX.ocp.svc
diff --git a/ci_images/rhel-8/ci-openshift-build-root/Dockerfile.previous b/ci_images/rhel-8/ci-openshift-build-root/Dockerfile.previous
index dd22b6b157..8411766e3b 100644
--- a/ci_images/rhel-8/ci-openshift-build-root/Dockerfile.previous
+++ b/ci_images/rhel-8/ci-openshift-build-root/Dockerfile.previous
@@ -67,3 +67,8 @@ RUN mkdir -p $GOPATH && \
 # Some image building tools don't create a missing WORKDIR
 RUN mkdir -p /go/src/github.com/openshift/origin
 WORKDIR /go/src/github.com/openshift/origin
+
+# These services run on the build farms and serve RPMs to CI workloads.
+# This environment variable is used by dnf_wrapper.sh to know which service
+# to acquire repo information from.
+ENV CI_RPM_SVC=base-MAJOR-MINOR-rhelX.ocp.svc
diff --git a/ci_images/rhel-8/ci-openshift-golang-builder/Dockerfile b/ci_images/rhel-8/ci-openshift-golang-builder/Dockerfile
index 5bed6a859b..1335d491db 100644
--- a/ci_images/rhel-8/ci-openshift-golang-builder/Dockerfile
+++ b/ci_images/rhel-8/ci-openshift-golang-builder/Dockerfile
@@ -39,4 +39,9 @@ ADD .oit/unsigned.repo $DNF_WRAPPER_DIR/
 
 # Some image building tools don't create a missing WORKDIR
 RUN mkdir -p /go/src/github.com/openshift/origin
-WORKDIR /go/src/github.com/openshift/origin
\ No newline at end of file
+WORKDIR /go/src/github.com/openshift/origin
+
+# These services run on the build farms and serve RPMs to CI workloads.
+# This environment variable is used by dnf_wrapper.sh to know which service
+# to acquire repo information from.
+ENV CI_RPM_SVC=base-MAJOR-MINOR-rhelX.ocp.svc
diff --git a/ci_images/rhel-9/ci-openshift-build-root/Dockerfile b/ci_images/rhel-9/ci-openshift-build-root/Dockerfile
index 97277ff5ea..6e290b98ef 100644
--- a/ci_images/rhel-9/ci-openshift-build-root/Dockerfile
+++ b/ci_images/rhel-9/ci-openshift-build-root/Dockerfile
@@ -68,3 +68,8 @@ RUN mkdir -p $GOPATH && \
 # Some image building tools don't create a missing WORKDIR
 RUN mkdir -p /go/src/github.com/openshift/origin
 WORKDIR /go/src/github.com/openshift/origin
+
+# These services run on the build farms and serve RPMs to CI workloads.
+# This environment variable is used by dnf_wrapper.sh to know which service
+# to acquire repo information from.
+ENV CI_RPM_SVC=base-MAJOR-MINOR-rhelX.ocp.svc
diff --git a/ci_images/rhel-9/ci-openshift-build-root/Dockerfile.previous b/ci_images/rhel-9/ci-openshift-build-root/Dockerfile.previous
index dfba028dcc..fd3d411338 100644
--- a/ci_images/rhel-9/ci-openshift-build-root/Dockerfile.previous
+++ b/ci_images/rhel-9/ci-openshift-build-root/Dockerfile.previous
@@ -67,3 +67,8 @@ RUN mkdir -p $GOPATH && \
 # Some image building tools don't create a missing WORKDIR
 RUN mkdir -p /go/src/github.com/openshift/origin
 WORKDIR /go/src/github.com/openshift/origin
+
+# These services run on the build farms and serve RPMs to CI workloads.
+# This environment variable is used by dnf_wrapper.sh to know which service
+# to acquire repo information from.
+ENV CI_RPM_SVC=base-MAJOR-MINOR-rhelX.ocp.svc
diff --git a/ci_images/rhel-9/ci-openshift-golang-builder/Dockerfile b/ci_images/rhel-9/ci-openshift-golang-builder/Dockerfile
index 247751b954..0d443ebbaa 100644
--- a/ci_images/rhel-9/ci-openshift-golang-builder/Dockerfile
+++ b/ci_images/rhel-9/ci-openshift-golang-builder/Dockerfile
@@ -33,3 +33,7 @@ ENV PATH=$DNF_WRAPPER_DIR:$PATH
 # it is not running on a build farm.
 ADD .oit/unsigned.repo $DNF_WRAPPER_DIR/
 
+# These services run on the build farms and serve RPMs to CI workloads.
+# This environment variable is used by dnf_wrapper.sh to know which service
+# to acquire repo information from.
+ENV CI_RPM_SVC=base-MAJOR-MINOR-rhelX.ocp.svc
diff --git a/images/ci-openshift-build-root-latest.rhel8.yml b/images/ci-openshift-build-root-latest.rhel8.yml
index c2e9800951..797e6507f9 100644
--- a/images/ci-openshift-build-root-latest.rhel8.yml
+++ b/images/ci-openshift-build-root-latest.rhel8.yml
@@ -1,6 +1,8 @@
 content:
-  # set_build_variables is necessary in order to set CI_RPM_SVC (see .envs below) in the Dockerfile.
-  set_build_variables: true
+  # set_build_variables to false, as setting git commit env vars break certain
+  # workloads. Set env vars in the Dockerfile, and use modifications if they
+  # should be variable
+  set_build_variables: false
   source:
     dockerfile: ci_images/rhel-8/ci-openshift-build-root/Dockerfile
     git:
@@ -14,6 +16,10 @@ content:
       mirror: true
       mirror_manifest_list: true
       upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-golang-{GO_LATEST}-ci-build-root-multi-openshift-{MAJOR}.{MINOR}
+    modifications:
+    - action: replace
+      match: "ENV CI_RPM_SVC=base-MAJOR-MINOR-rhelX.ocp.svc"
+      replacement: "ENV CI_RPM_SVC=base-{MAJOR}-{MINOR}-rhel8.ocp.svc"
 from:
   member: ci-openshift-golang-builder-latest.rhel8
 labels:
@@ -41,12 +47,6 @@ owners:
 maintainer:
   component: Release
 
-envs:
-  # These services run on the build farms and serve RPMs to CI workloads.
-  # This environment variable is used by dnf_wrapper.sh to know which service
-  # to acquire repo information from.
-  CI_RPM_SVC: "base-{MAJOR}-{MINOR}-rhel8.ocp.svc"
-
 # The from: stanza is exactly what we want to use. So ignore anything in
 # the Dockerfile.
 canonical_builders_from_upstream: false
diff --git a/images/ci-openshift-build-root-latest.rhel9.yml b/images/ci-openshift-build-root-latest.rhel9.yml
index 4822b61d73..6d6ec07122 100644
--- a/images/ci-openshift-build-root-latest.rhel9.yml
+++ b/images/ci-openshift-build-root-latest.rhel9.yml
@@ -1,6 +1,8 @@
 content:
-  # set_build_variables is necessary in order to set CI_RPM_SVC (see .envs below) in the Dockerfile.
-  set_build_variables: true
+  # set_build_variables to false, as setting git commit env vars break certain
+  # workloads. Set env vars in the Dockerfile, and use modifications if they
+  # should be variable
+  set_build_variables: false
   source:
     dockerfile: ci_images/rhel-9/ci-openshift-build-root/Dockerfile
     git:
@@ -14,6 +16,11 @@ content:
       mirror: true
       mirror_manifest_list: true
       upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-golang-{GO_LATEST}-ci-build-root-multi-openshift-{MAJOR}.{MINOR}
+    modifications:
+    - action: replace
+      match: "ENV CI_RPM_SVC=base-MAJOR-MINOR-rhelX.ocp.svc"
+      replacement: "ENV CI_RPM_SVC=base-{MAJOR}-{MINOR}-rhel9.ocp.svc"
+
 from:
   member: ci-openshift-golang-builder-latest.rhel9
 labels:
@@ -41,12 +48,6 @@ owners:
 maintainer:
   component: Release
 
-envs:
-  # These services run on the build farms and serve RPMs to CI workloads.
-  # This environment variable is used by dnf_wrapper.sh to know which service
-  # to acquire repo information from.
-  CI_RPM_SVC: "base-{MAJOR}-{MINOR}-rhel9.ocp.svc"
-
 # The from: stanza is exactly what we want to use. So ignore anything in
 # the Dockerfile.
 canonical_builders_from_upstream: false
diff --git a/images/ci-openshift-build-root-previous.rhel8.disabled b/images/ci-openshift-build-root-previous.rhel8.disabled
index f89d52870d..60ee2de003 100644
--- a/images/ci-openshift-build-root-previous.rhel8.disabled
+++ b/images/ci-openshift-build-root-previous.rhel8.disabled
@@ -1,6 +1,8 @@
 content:
-  # set_build_variables is necessary in order to set CI_RPM_SVC (see .envs below) in the Dockerfile.
-  set_build_variables: true
+  # set_build_variables to false, as setting git commit env vars break certain
+  # workloads. Set env vars in the Dockerfile, and use modifications if they
+  # should be variable
+  set_build_variables: false
   source:
     dockerfile: ci_images/rhel-8/ci-openshift-build-root/Dockerfile.previous
     git:
@@ -14,6 +16,11 @@ content:
       mirror: true
       mirror_manifest_list: true
       upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-golang-{GO_PREVIOUS}-ci-build-root-multi-openshift-{MAJOR}.{MINOR}
+    modifications:
+    - action: replace
+      match: "ENV CI_RPM_SVC=base-MAJOR-MINOR-rhelX.ocp.svc"
+      replacement: "ENV CI_RPM_SVC=base-{MAJOR}-{MINOR}-rhel8.ocp.svc"
+
 from:
   member: ci-openshift-golang-builder-previous.rhel8
 labels:
@@ -41,12 +48,6 @@ owners:
 maintainer:
   component: Release
 
-envs:
-  # These services run on the build farms and serve RPMs to CI workloads.
-  # This environment variable is used by dnf_wrapper.sh to know which service
-  # to acquire repo information from.
-  CI_RPM_SVC: "base-{MAJOR}-{MINOR}-rhel8.ocp.svc"
-
 # The from: stanza is exactly what we want to use. So ignore anything in
 # the Dockerfile.
 canonical_builders_from_upstream: false
diff --git a/images/ci-openshift-build-root-previous.rhel9.disabled b/images/ci-openshift-build-root-previous.rhel9.disabled
index c8242bb370..52de9423a4 100644
--- a/images/ci-openshift-build-root-previous.rhel9.disabled
+++ b/images/ci-openshift-build-root-previous.rhel9.disabled
@@ -1,6 +1,8 @@
 content:
-  # set_build_variables is necessary in order to set CI_RPM_SVC (see .envs below) in the Dockerfile.
-  set_build_variables: true
+  # set_build_variables to false, as setting git commit env vars break certain
+  # workloads. Set env vars in the Dockerfile, and use modifications if they
+  # should be variable
+  set_build_variables: false
   source:
     dockerfile: ci_images/rhel-9/ci-openshift-build-root/Dockerfile.previous
     git:
@@ -14,6 +16,11 @@ content:
       mirror: true
       mirror_manifest_list: true
       upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-golang-{GO_PREVIOUS}-ci-build-root-multi-openshift-{MAJOR}.{MINOR}
+    modifications:
+    - action: replace
+      match: "ENV CI_RPM_SVC=base-MAJOR-MINOR-rhelX.ocp.svc"
+      replacement: "ENV CI_RPM_SVC=base-{MAJOR}-{MINOR}-rhel9.ocp.svc"
+
 from:
   member: ci-openshift-golang-builder-previous.rhel9
 labels:
@@ -41,12 +48,6 @@ owners:
 maintainer:
   component: Release
 
-envs:
-  # These services run on the build farms and serve RPMs to CI workloads.
-  # This environment variable is used by dnf_wrapper.sh to know which service
-  # to acquire repo information from.
-  CI_RPM_SVC: "base-{MAJOR}-{MINOR}-rhel9.ocp.svc"
-
 # The from: stanza is exactly what we want to use. So ignore anything in
 # the Dockerfile.
 canonical_builders_from_upstream: false
diff --git a/images/ci-openshift-golang-builder-latest.rhel8.yml b/images/ci-openshift-golang-builder-latest.rhel8.yml
index 28b9825031..54a358dfc1 100644
--- a/images/ci-openshift-golang-builder-latest.rhel8.yml
+++ b/images/ci-openshift-golang-builder-latest.rhel8.yml
@@ -1,6 +1,8 @@
 content:
-  # set_build_variables is necessary in order to set CI_RPM_SVC (see .envs below) in the Dockerfile.
-  set_build_variables: true
+  # set_build_variables to false, as setting git commit env vars break certain
+  # workloads. Set env vars in the Dockerfile, and use modifications if they
+  # should be variable
+  set_build_variables: false
   source:
     dockerfile: ci_images/rhel-8/ci-openshift-golang-builder/Dockerfile
     git:
@@ -14,6 +16,11 @@ content:
       mirror: true
       mirror_manifest_list: true
       upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-golang-{GO_LATEST}-builder-multi-openshift-{MAJOR}.{MINOR}
+    modifications:
+    - action: replace
+      match: "ENV CI_RPM_SVC=base-MAJOR-MINOR-rhelX.ocp.svc"
+      replacement: "ENV CI_RPM_SVC=base-{MAJOR}-{MINOR}-rhel8.ocp.svc"
+
 from:
   stream: rhel-8-golang-{GO_LATEST}
 labels:
@@ -42,12 +49,6 @@ owners:
 maintainer:
   component: Release
 
-envs:
-  # These services run on the build farms and serve RPMs to CI workloads.
-  # This environment variable is used by dnf_wrapper.sh to know which service
-  # to acquire repo information from.
-  CI_RPM_SVC: "base-{MAJOR}-{MINOR}-rhel8.ocp.svc"
-
 # The from: stanza is exactly what we want to use. So ignore anything in
 # the Dockerfile.
 canonical_builders_from_upstream: false
diff --git a/images/ci-openshift-golang-builder-latest.rhel9.yml b/images/ci-openshift-golang-builder-latest.rhel9.yml
index 0455eba218..8d2bf5da9c 100644
--- a/images/ci-openshift-golang-builder-latest.rhel9.yml
+++ b/images/ci-openshift-golang-builder-latest.rhel9.yml
@@ -1,6 +1,8 @@
 content:
-  # set_build_variables is necessary in order to set CI_RPM_SVC (see .envs below) in the Dockerfile.
-  set_build_variables: true
+  # set_build_variables to false, as setting git commit env vars break certain
+  # workloads. Set env vars in the Dockerfile, and use modifications if they
+  # should be variable
+  set_build_variables: false
   source:
     dockerfile: ci_images/rhel-9/ci-openshift-golang-builder/Dockerfile
     git:
@@ -14,6 +16,11 @@ content:
       mirror: true
       mirror_manifest_list: true
       upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-golang-{GO_LATEST}-builder-multi-openshift-{MAJOR}.{MINOR}
+    modifications:
+    - action: replace
+      match: "ENV CI_RPM_SVC=base-MAJOR-MINOR-rhelX.ocp.svc"
+      replacement: "ENV CI_RPM_SVC=base-{MAJOR}-{MINOR}-rhel9.ocp.svc"
+
 from:
   stream: rhel-9-golang-{GO_LATEST}
 labels:
@@ -41,12 +48,6 @@ owners:
 maintainer:
   component: Release
 
-envs:
-  # These services run on the build farms and serve RPMs to CI workloads.
-  # This environment variable is used by dnf_wrapper.sh to know which service
-  # to acquire repo information from.
-  CI_RPM_SVC: "base-{MAJOR}-{MINOR}-rhel9.ocp.svc"
-
 # The from: stanza is exactly what we want to use. So ignore anything in
 # the Dockerfile.
 canonical_builders_from_upstream: false
diff --git a/images/ci-openshift-golang-builder-previous.rhel8.disabled b/images/ci-openshift-golang-builder-previous.rhel8.disabled
index 756819d41a..46254838b5 100644
--- a/images/ci-openshift-golang-builder-previous.rhel8.disabled
+++ b/images/ci-openshift-golang-builder-previous.rhel8.disabled
@@ -1,6 +1,8 @@
 content:
-  # set_build_variables is necessary in order to set CI_RPM_SVC (see .envs below) in the Dockerfile.
-  set_build_variables: true
+  # set_build_variables to false, as setting git commit env vars break certain
+  # workloads. Set env vars in the Dockerfile, and use modifications if they
+  # should be variable
+  set_build_variables: false
   source:
     dockerfile: ci_images/rhel-8/ci-openshift-golang-builder/Dockerfile
     git:
@@ -14,6 +16,11 @@ content:
       mirror: true
       mirror_manifest_list: true
       upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-golang-{GO_PREVIOUS}-builder-multi-openshift-{MAJOR}.{MINOR}
+    modifications:
+    - action: replace
+      match: "ENV CI_RPM_SVC=base-MAJOR-MINOR-rhelX.ocp.svc"
+      replacement: "ENV CI_RPM_SVC=base-{MAJOR}-{MINOR}-rhel8.ocp.svc"
+
 from:
   stream: rhel-8-golang-{GO_PREVIOUS}
 labels:
@@ -42,12 +49,6 @@ owners:
 maintainer:
   component: Release
 
-envs:
-  # These services run on the build farms and serve RPMs to CI workloads.
-  # This environment variable is used by dnf_wrapper.sh to know which service
-  # to acquire repo information from.
-  CI_RPM_SVC: "base-{MAJOR}-{MINOR}-rhel8.ocp.svc"
-
 # The from: stanza is exactly what we want to use. So ignore anything in
 # the Dockerfile.
 canonical_builders_from_upstream: false
diff --git a/images/ci-openshift-golang-builder-previous.rhel9.disabled b/images/ci-openshift-golang-builder-previous.rhel9.disabled
index cdb3618643..29e0b65694 100644
--- a/images/ci-openshift-golang-builder-previous.rhel9.disabled
+++ b/images/ci-openshift-golang-builder-previous.rhel9.disabled
@@ -1,6 +1,8 @@
 content:
-  # set_build_variables is necessary in order to set CI_RPM_SVC (see .envs below) in the Dockerfile.
-  set_build_variables: true
+  # set_build_variables to false, as setting git commit env vars break certain
+  # workloads. Set env vars in the Dockerfile, and use modifications if they
+  # should be variable
+  set_build_variables: false
   source:
     dockerfile: ci_images/rhel-9/ci-openshift-golang-builder/Dockerfile
     git:
@@ -14,6 +16,11 @@ content:
       mirror: true
       mirror_manifest_list: true
       upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-golang-{GO_PREVIOUS}-builder-multi-openshift-{MAJOR}.{MINOR}
+    modifications:
+    - action: replace
+      match: "ENV CI_RPM_SVC=base-MAJOR-MINOR-rhelX.ocp.svc"
+      replacement: "ENV CI_RPM_SVC=base-{MAJOR}-{MINOR}-rhel9.ocp.svc"
+
 from:
   stream: rhel-9-golang-{GO_PREVIOUS}
 labels:
@@ -41,12 +48,6 @@ owners:
 maintainer:
   component: Release
 
-envs:
-  # These services run on the build farms and serve RPMs to CI workloads.
-  # This environment variable is used by dnf_wrapper.sh to know which service
-  # to acquire repo information from.
-  CI_RPM_SVC: "base-{MAJOR}-{MINOR}-rhel9.ocp.svc"
-
 # The from: stanza is exactly what we want to use. So ignore anything in
 # the Dockerfile.
 canonical_builders_from_upstream: false