diff --git a/.github/workflows/build-ee.yml b/.github/workflows/build-ee.yml
index 29d3f74..692a204 100644
--- a/.github/workflows/build-ee.yml
+++ b/.github/workflows/build-ee.yml
@@ -72,6 +72,7 @@ jobs:
             openshift-virtualization-migration-ee-${{ matrix.aap_version }}/context/Containerfile
           platforms: linux/amd64,linux/arm64
           build-args: |
+            OCP_VERSION=4.21
             REDHAT_ORG=${{ secrets.REDHAT_ORG }}
             REDHAT_ACTIVATION_KEY=${{ secrets.REDHAT_ACTIVATION_KEY }}
             ANSIBLE_GALAXY_SERVER_AUTOMATION_HUB_VALIDATED_TOKEN=${{ secrets.AH_TOKEN_VALIDATED }}
diff --git a/openshift-virtualization-migration-ee-2.4/execution-environment.yml b/openshift-virtualization-migration-ee-2.4/execution-environment.yml
index 4d739db..cae3428 100644
--- a/openshift-virtualization-migration-ee-2.4/execution-environment.yml
+++ b/openshift-virtualization-migration-ee-2.4/execution-environment.yml
@@ -27,7 +27,8 @@ additional_build_steps:
     - RUN $PYCMD -m pip install --upgrade pip setuptools
 
   prepend_builder:
-    - ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-4.21-for-rhel-9-*-rpms"
+    - ARG OCP_VERSION=4.21
+    - ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-${OCP_VERSION}-for-rhel-9-*-rpms"
 
   prepend_galaxy:
     - ARG ANSIBLE_GALAXY_SERVER_AUTOMATION_HUB_VALIDATED_URL
@@ -41,7 +42,8 @@ additional_build_steps:
     - ARG ANSIBLE_GALAXY_SERVER_LIST
 
   prepend_final:
-    - ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-4.21-for-rhel-9-*-rpms"
+    - ARG OCP_VERSION=4.21
+    - ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-${OCP_VERSION}-for-rhel-9-*-rpms"
 
   append_final:
     - RUN ln -sf /usr/bin/python3.12 /usr/bin/python3
diff --git a/openshift-virtualization-migration-ee-2.5/execution-environment.yml b/openshift-virtualization-migration-ee-2.5/execution-environment.yml
index 41cec2b..fde627d 100644
--- a/openshift-virtualization-migration-ee-2.5/execution-environment.yml
+++ b/openshift-virtualization-migration-ee-2.5/execution-environment.yml
@@ -27,7 +27,8 @@ additional_build_steps:
     - RUN $PYCMD -m pip install --upgrade pip setuptools
 
   prepend_builder:
-    - ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-4.21-for-rhel-9-*-rpms"
+    - ARG OCP_VERSION=4.21
+    - ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-${OCP_VERSION}-for-rhel-9-*-rpms"
 
   prepend_galaxy:
     - ARG ANSIBLE_GALAXY_SERVER_AUTOMATION_HUB_VALIDATED_URL
@@ -41,7 +42,8 @@ additional_build_steps:
     - ARG ANSIBLE_GALAXY_SERVER_LIST
 
   prepend_final:
-    - ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-4.21-for-rhel-9-*-rpms"
+    - ARG OCP_VERSION=4.21
+    - ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-${OCP_VERSION}-for-rhel-9-*-rpms"
 
   append_final:
     - RUN ln -sf /usr/bin/python3.12 /usr/bin/python3
diff --git a/openshift-virtualization-migration-ee-2.6/execution-environment.yml b/openshift-virtualization-migration-ee-2.6/execution-environment.yml
index f024e7e..cee7d57 100644
--- a/openshift-virtualization-migration-ee-2.6/execution-environment.yml
+++ b/openshift-virtualization-migration-ee-2.6/execution-environment.yml
@@ -27,7 +27,8 @@ additional_build_steps:
     - RUN $PYCMD -m pip install --upgrade pip setuptools
 
   prepend_builder:
-    - ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-4.21-for-rhel-9-*-rpms"
+    - ARG OCP_VERSION=4.21
+    - ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-${OCP_VERSION}-for-rhel-9-*-rpms"
 
   prepend_galaxy:
     - ARG ANSIBLE_GALAXY_SERVER_AUTOMATION_HUB_VALIDATED_URL
@@ -41,7 +42,8 @@ additional_build_steps:
     - ARG ANSIBLE_GALAXY_SERVER_LIST
 
   prepend_final:
-    - ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-4.21-for-rhel-9-*-rpms"
+    - ARG OCP_VERSION=4.21
+    - ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-${OCP_VERSION}-for-rhel-9-*-rpms"
 
   append_final:
     - RUN ln -sf /usr/bin/python3.12 /usr/bin/python3