diff --git a/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-devel-40.yaml b/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-devel-40.yaml
deleted file mode 100644
index 1fb42a6a14131..0000000000000
--- a/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-devel-40.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-tag_specification:
-  name: '4.0'
-  namespace: ocp
-promotion:
-  cluster: https://api.ci.openshift.org
-  namespace: ci-byoh
-  tag: devel-40
-base_rpm_images:
-  os:
-    cluster: https://api.ci.openshift.org
-    name: centos
-    namespace: openshift
-    tag: '7'
-
-raw_steps:
-# TODO: until ansible has all necessary RPMs mirrored, create a synthetic
-#       base image that is a copy of the existing Origin base image (instead of the
-#       new UBI base image).
-- pipeline_image_cache_step:
-    commands: |
-      INSTALL_PKGS="which tar wget hostname sysvinit-tools util-linux socat tree findutils lsof bind-utils shadow-utils"
-      cat <<DOCKERFILE > /opt/Dockerfile
-      FROM os
-      RUN mkdir -p /var/lib/origin && \
-          yum install -y ${INSTALL_PKGS} && \
-          rpm -V ${INSTALL_PKGS} && \
-          yum clean all && rm -rf /var/cache/yum/*
-      DOCKERFILE
-    from: os
-    to: src-dockerfile
-- project_directory_image_build_step:
-    from: os
-    inputs:
-      src-dockerfile:
-        paths:
-        - destination_dir: .
-          source_path: /opt/Dockerfile
-      src: {}
-    to: base
-
-images:
-- dockerfile_path: images/installer/Dockerfile
-  from: base
-  to: ansible
-resources:
-  '*':
-    limits:
-      memory: 4Gi
-    requests:
-      cpu: 100m
-      memory: 200Mi
-  unit:
-    limits:
-      memory: 3Gi
-    requests:
-      cpu: '1'
-      memory: 1.5Gi
-rpm_build_commands: tito tag --offline --accept-auto-changelog --use-release '9999%{?dist}'; tito build --output="_output/local/releases" --rpm --test --offline --quiet; mkdir -p _output/local/releases/rpms; mv _output/local/releases/noarch/* _output/local/releases/rpms; createrepo _output/local/releases/rpms
-build_root:
-  image_stream_tag:
-    cluster: https://api.ci.openshift.org
-    name: release
-    namespace: openshift
-    tag: golang-1.10
-test_binary_build_commands: yum install -y gcc libffi-devel python-devel openssl-devel
-  python-pip; pip install tox; chmod uga+w /etc/passwd
-tests:
-- artifact_dir: /tmp/artifacts
-  as: unit
-  commands: echo "${USER:-default}:x:$(id -u):$(id -g):Default User:$HOME:/sbin/nologin"
-    >> /etc/passwd; tox 2>&1 | tee /tmp/artifacts/output.log
-  container:
-    from: test-bin
-- as: e2e-aws-scaleup
-  commands: TEST_SUITE=openshift/conformance run-tests
-  openshift_ansible_40:
-    cluster_profile: aws-centos-40
diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
index c27ebbfbc7f1b..3de74357477c0 100644
--- a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
@@ -592,8 +592,8 @@ presubmits:
               name: ci-operator-master-configs
         - name: JOB_NAME_SAFE
           value: e2e-rhel-scaleup
-        - name: RPM_REPO_OPENSHIFT_ORIGIN
-          value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.1/
+        - name: OPENSHIFT_VERSION
+          value: "4.1"
         - name: TEST_COMMAND
           value: TEST_SUITE=openshift/conformance run-tests
         image: ci-operator:latest
diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.0-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.0-presubmits.yaml
index 96ceca6ae0fd5..049972a74264b 100644
--- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.0-presubmits.yaml
+++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.0-presubmits.yaml
@@ -133,8 +133,8 @@ presubmits:
               name: ci-operator-4.0-configs
         - name: JOB_NAME_SAFE
           value: e2e-rhel-scaleup
-        - name: RPM_REPO_OPENSHIFT_ORIGIN
-          value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/
+        - name: OPENSHIFT_VERSION
+          value: "4.0"
         - name: TEST_COMMAND
           value: TEST_SUITE=openshift/conformance run-tests
         image: ci-operator:latest
diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.1-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.1-presubmits.yaml
index 568121ff2b9be..8806816fd4ea7 100644
--- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.1-presubmits.yaml
+++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.1-presubmits.yaml
@@ -133,8 +133,8 @@ presubmits:
               name: ci-operator-4.1-configs
         - name: JOB_NAME_SAFE
           value: e2e-rhel-scaleup
-        - name: RPM_REPO_OPENSHIFT_ORIGIN
-          value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.1/
+        - name: OPENSHIFT_VERSION
+          value: "4.1"
         - name: TEST_COMMAND
           value: TEST_SUITE=openshift/conformance run-tests
         image: ci-operator:latest
diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml
index 63c2a8c9934ed..7f489ded6a940 100644
--- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml
@@ -234,8 +234,8 @@ presubmits:
               name: ci-operator-master-configs
         - name: JOB_NAME_SAFE
           value: e2e-rhel-scaleup
-        - name: RPM_REPO_OPENSHIFT_ORIGIN
-          value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.1/
+        - name: OPENSHIFT_VERSION
+          value: "4.1"
         - name: TEST_COMMAND
           value: TEST_SUITE=openshift/conformance run-tests
         image: ci-operator:latest
diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.0-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.0-presubmits.yaml
index 188f3844584c6..1739610f2192f 100644
--- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.0-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.0-presubmits.yaml
@@ -224,8 +224,8 @@ presubmits:
               name: ci-operator-4.0-configs
         - name: JOB_NAME_SAFE
           value: e2e-rhel-scaleup
-        - name: RPM_REPO_OPENSHIFT_ORIGIN
-          value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/
+        - name: OPENSHIFT_VERSION
+          value: "4.0"
         - name: TEST_COMMAND
           value: TEST_SUITE=openshift/conformance run-tests
         image: ci-operator:latest
diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.1-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.1-presubmits.yaml
index ed44d5764aa24..32614fb1fd3de 100644
--- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.1-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.1-presubmits.yaml
@@ -224,8 +224,8 @@ presubmits:
               name: ci-operator-4.1-configs
         - name: JOB_NAME_SAFE
           value: e2e-rhel-scaleup
-        - name: RPM_REPO_OPENSHIFT_ORIGIN
-          value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.1/
+        - name: OPENSHIFT_VERSION
+          value: "4.1"
         - name: TEST_COMMAND
           value: TEST_SUITE=openshift/conformance run-tests
         image: ci-operator:latest
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml
index f475eea289554..6cb5cb9f02e4b 100644
--- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml
@@ -193,8 +193,8 @@ presubmits:
               name: ci-operator-master-configs
         - name: JOB_NAME_SAFE
           value: e2e-rhel-scaleup
-        - name: RPM_REPO_OPENSHIFT_ORIGIN
-          value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.1/
+        - name: OPENSHIFT_VERSION
+          value: "4.1"
         - name: TEST_COMMAND
           value: TEST_SUITE=openshift/conformance run-tests
         image: ci-operator:latest
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.0-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.0-presubmits.yaml
index c4a58b02f45ab..6b6e79069cad0 100644
--- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.0-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.0-presubmits.yaml
@@ -190,8 +190,8 @@ presubmits:
               name: ci-operator-4.0-configs
         - name: JOB_NAME_SAFE
           value: e2e-rhel-scaleup
-        - name: RPM_REPO_OPENSHIFT_ORIGIN
-          value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/
+        - name: OPENSHIFT_VERSION
+          value: "4.0"
         - name: TEST_COMMAND
           value: TEST_SUITE=openshift/conformance run-tests
         image: ci-operator:latest
diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1-presubmits.yaml
index 5e067e94c7627..3f066a3895cf5 100644
--- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1-presubmits.yaml
+++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1-presubmits.yaml
@@ -190,8 +190,8 @@ presubmits:
               name: ci-operator-4.1-configs
         - name: JOB_NAME_SAFE
           value: e2e-rhel-scaleup
-        - name: RPM_REPO_OPENSHIFT_ORIGIN
-          value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.1/
+        - name: OPENSHIFT_VERSION
+          value: "4.1"
         - name: TEST_COMMAND
           value: TEST_SUITE=openshift/conformance run-tests
         image: ci-operator:latest
diff --git a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-devel-40-postsubmits.yaml b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-devel-40-postsubmits.yaml
deleted file mode 100644
index 46f127cf739b4..0000000000000
--- a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-devel-40-postsubmits.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-postsubmits:
-  openshift/openshift-ansible:
-  - agent: kubernetes
-    branches:
-    - ^devel-40$
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/prowgen-controlled: "true"
-    name: branch-ci-openshift-openshift-ansible-devel-40-images
-    spec:
-      containers:
-      - args:
-        - --artifact-dir=$(ARTIFACTS)
-        - --give-pr-author-access-to-namespace=true
-        - --promote
-        - --target=[images]
-        command:
-        - ci-operator
-        env:
-        - name: CONFIG_SPEC
-          valueFrom:
-            configMapKeyRef:
-              key: openshift-openshift-ansible-devel-40.yaml
-              name: ci-operator-misc-configs
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-      serviceAccountName: ci-operator
diff --git a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-devel-40-presubmits.yaml b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-devel-40-presubmits.yaml
deleted file mode 100644
index 0174d56cb8889..0000000000000
--- a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-devel-40-presubmits.yaml
+++ /dev/null
@@ -1,131 +0,0 @@
-presubmits:
-  openshift/openshift-ansible:
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - devel-40
-    context: ci/prow/e2e-aws-scaleup
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/prowgen-controlled: "true"
-    name: pull-ci-openshift-openshift-ansible-devel-40-e2e-aws-scaleup
-    rerun_command: /test e2e-aws-scaleup
-    spec:
-      containers:
-      - args:
-        - --artifact-dir=$(ARTIFACTS)
-        - --give-pr-author-access-to-namespace=true
-        - --secret-dir=/usr/local/e2e-aws-scaleup-cluster-profile
-        - --target=e2e-aws-scaleup
-        - --template=/usr/local/e2e-aws-scaleup
-        command:
-        - ci-operator
-        env:
-        - name: CLUSTER_TYPE
-          value: aws
-        - name: CONFIG_SPEC
-          valueFrom:
-            configMapKeyRef:
-              key: openshift-openshift-ansible-devel-40.yaml
-              name: ci-operator-misc-configs
-        - name: JOB_NAME_SAFE
-          value: e2e-aws-scaleup
-        - name: RPM_REPO_OPENSHIFT_ORIGIN
-          value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/
-        - name: TEST_COMMAND
-          value: TEST_SUITE=openshift/conformance run-tests
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-        volumeMounts:
-        - mountPath: /usr/local/e2e-aws-scaleup-cluster-profile
-          name: cluster-profile
-        - mountPath: /usr/local/e2e-aws-scaleup
-          name: job-definition
-          subPath: cluster-scaleup-e2e-40.yaml
-      serviceAccountName: ci-operator
-      volumes:
-      - name: cluster-profile
-        projected:
-          sources:
-          - secret:
-              name: cluster-secrets-aws
-          - configMap:
-              name: cluster-profile-aws-centos-40
-      - configMap:
-          name: prow-job-cluster-scaleup-e2e-40
-        name: job-definition
-    trigger: '(?m)^/test (?:.*? )?e2e-aws-scaleup(?: .*?)?$'
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - devel-40
-    context: ci/prow/images
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/prowgen-controlled: "true"
-    name: pull-ci-openshift-openshift-ansible-devel-40-images
-    rerun_command: /test images
-    spec:
-      containers:
-      - args:
-        - --artifact-dir=$(ARTIFACTS)
-        - --give-pr-author-access-to-namespace=true
-        - --target=[images]
-        command:
-        - ci-operator
-        env:
-        - name: CONFIG_SPEC
-          valueFrom:
-            configMapKeyRef:
-              key: openshift-openshift-ansible-devel-40.yaml
-              name: ci-operator-misc-configs
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-      serviceAccountName: ci-operator
-    trigger: '(?m)^/test (?:.*? )?images(?: .*?)?$'
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - devel-40
-    context: ci/prow/unit
-    decorate: true
-    decoration_config:
-      skip_cloning: true
-    labels:
-      ci-operator.openshift.io/prowgen-controlled: "true"
-    name: pull-ci-openshift-openshift-ansible-devel-40-unit
-    rerun_command: /test unit
-    spec:
-      containers:
-      - args:
-        - --artifact-dir=$(ARTIFACTS)
-        - --give-pr-author-access-to-namespace=true
-        - --target=unit
-        command:
-        - ci-operator
-        env:
-        - name: CONFIG_SPEC
-          valueFrom:
-            configMapKeyRef:
-              key: openshift-openshift-ansible-devel-40.yaml
-              name: ci-operator-misc-configs
-        image: ci-operator:latest
-        imagePullPolicy: Always
-        name: ""
-        resources:
-          requests:
-            cpu: 10m
-      serviceAccountName: ci-operator
-    trigger: '(?m)^/test (?:.*? )?unit(?: .*?)?$'
diff --git a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-master-presubmits.yaml b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-master-presubmits.yaml
index c2cd2d045569e..7ff8d939083c8 100644
--- a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-master-presubmits.yaml
@@ -32,8 +32,8 @@ presubmits:
               name: ci-operator-master-configs
         - name: JOB_NAME_SAFE
           value: e2e-aws-scaleup-rhel7
-        - name: RPM_REPO_OPENSHIFT_ORIGIN
-          value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.1/
+        - name: OPENSHIFT_VERSION
+          value: "4.1"
         - name: TEST_COMMAND
           value: TEST_SUITE=openshift/conformance run-tests
         image: ci-operator:latest
diff --git a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-4.0-presubmits.yaml b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-4.0-presubmits.yaml
index 48ba264537a69..a222ad62a4f3d 100644
--- a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-4.0-presubmits.yaml
+++ b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-4.0-presubmits.yaml
@@ -32,8 +32,8 @@ presubmits:
               name: ci-operator-4.0-configs
         - name: JOB_NAME_SAFE
           value: e2e-aws-scaleup-rhel7
-        - name: RPM_REPO_OPENSHIFT_ORIGIN
-          value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/
+        - name: OPENSHIFT_VERSION
+          value: "4.0"
         - name: TEST_COMMAND
           value: TEST_SUITE=openshift/conformance run-tests
         image: ci-operator:latest
diff --git a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-4.1-presubmits.yaml b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-4.1-presubmits.yaml
index 6021871dbb8fa..9bf52c1bf3e2b 100644
--- a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-4.1-presubmits.yaml
+++ b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-release-4.1-presubmits.yaml
@@ -32,8 +32,8 @@ presubmits:
               name: ci-operator-4.1-configs
         - name: JOB_NAME_SAFE
           value: e2e-aws-scaleup-rhel7
-        - name: RPM_REPO_OPENSHIFT_ORIGIN
-          value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.1/
+        - name: OPENSHIFT_VERSION
+          value: "4.1"
         - name: TEST_COMMAND
           value: TEST_SUITE=openshift/conformance run-tests
         image: ci-operator:latest
diff --git a/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml b/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml
index f6b5dc34ad621..dee1d3bfcf532 100644
--- a/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml
+++ b/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml
@@ -21,7 +21,7 @@ parameters:
   required: true
 - name: RELEASE_IMAGE_LATEST
   required: true
-- name: RPM_REPO_OPENSHIFT_ORIGIN
+- name: OPENSHIFT_VERSION
   required: true
 - name: BASE_DOMAIN
   value: origin-ci-int-aws.dev.rhcloud.com
@@ -118,11 +118,11 @@ objects:
 
         trap 'touch /tmp/shared/exit' EXIT
         trap 'kill $(jobs -p); exit 0' TERM
-        
+
         mkdir -p "${HOME}"
 
         echo -n "Waiting for scaleup to complete..."
-        
+
         while true; do
           if [[ -f /tmp/shared/exit ]]; then
             echo "Another process exited" 2>&1
@@ -139,7 +139,7 @@ objects:
         done
 
         echo "completed!"
-        
+
         # set up cloud-provider-specific env vars
         export KUBE_SSH_BASTION="$( oc --insecure-skip-tls-verify get node -l node-role.kubernetes.io/master -o 'jsonpath={.items[0].status.addresses[?(@.type=="ExternalIP")].address}' ):22"
         export KUBE_SSH_KEY_PATH=/tmp/cluster/ssh-privatekey
@@ -322,7 +322,7 @@ objects:
         echo -e "complete! \n Starting scaleup playbooks..."
 
         ansible-playbook -vvv \
-          -e "openshift_test_repo=${RPM_REPO_OPENSHIFT_ORIGIN}" \
+          -e "openshift_version=${OPENSHIFT_VERSION}" \
           -e kubeconfig_path=/tmp/artifacts/installer/auth/kubeconfig \
           test/${CLUSTER_TYPE}/scaleup.yml
 
diff --git a/cluster/test-deploy/aws-4.0/vars.yaml b/cluster/test-deploy/aws-4.0/vars.yaml
index fcb0be72607a4..302bac816b08e 100644
--- a/cluster/test-deploy/aws-4.0/vars.yaml
+++ b/cluster/test-deploy/aws-4.0/vars.yaml
@@ -6,16 +6,16 @@ ansible_user: "ec2-user"
 
 openshift_additional_repos:
   - name: "origin-pr"
-    baseurl: "{{ openshift_test_repo }}"
+    baseurl: "https://rpms.svc.ci.openshift.org/openshift-origin-v{{ openshift_version }}/"
     enabled: 1
     gpgcheck: 0
   - name: "criotested"
-    baseurl: "https://mirror.ops.rhcloud.com/enterprise/rhel/cri-o-tested/4.0/x86_64/os/
-      https://use-mirror1.ops.rhcloud.com/enterprise/rhel/cri-o-tested/4.0/x86_64/os/
-      https://use-mirror2.ops.rhcloud.com/enterprise/rhel/cri-o-tested/4.0/x86_64/os/
-      https://euw-mirror1.ops.rhcloud.com/enterprise/rhel/cri-o-tested/4.0/x86_64/os/
-      https://gce-mirror1.ops.rhcloud.com/enterprise/rhel/cri-o-tested/4.0/x86_64/os/
-      https://gce-mirror2.ops.rhcloud.com/enterprise/rhel/cri-o-tested/4.0/x86_64/os/"
+    baseurl: "https://mirror.ops.rhcloud.com/enterprise/rhel/cri-o-tested//x86_64/os/
+      https://use-mirror1.ops.rhcloud.com/enterprise/rhel/cri-o-tested/{{ openshift_version }}/x86_64/os/
+      https://use-mirror2.ops.rhcloud.com/enterprise/rhel/cri-o-tested/{{ openshift_version }}/x86_64/os/
+      https://euw-mirror1.ops.rhcloud.com/enterprise/rhel/cri-o-tested/{{ openshift_version }}/x86_64/os/
+      https://gce-mirror1.ops.rhcloud.com/enterprise/rhel/cri-o-tested/{{ openshift_version }}/x86_64/os/
+      https://gce-mirror2.ops.rhcloud.com/enterprise/rhel/cri-o-tested/{{ openshift_version }}/x86_64/os/"
     sslverify: "false"
     sslclientkey: "/var/lib/yum/ops-mirror.pem"
     sslclientcert: "/var/lib/yum/ops-mirror.pem"