diff --git a/.pipelines/role-definition.yml b/.pipelines/role-definition.yml
index ea038bd5285..9d305b09190 100644
--- a/.pipelines/role-definition.yml
+++ b/.pipelines/role-definition.yml
@@ -29,16 +29,11 @@ jobs:
           azureDevOpsJSONSPN: $(aro-v4-e2e-devops-spn)
 
       - script: |
+          set -e
           # retrieve the oc cli
           wget -nv https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/$(OpenShiftCLIVersion)/openshift-client-linux-$(OpenShiftCLIVersion).tar.gz
           tar xf openshift-client-linux-$(OpenShiftCLIVersion).tar.gz
           
-          verifiedVersion=4.14.37
-          
-          YVersion=$(echo $verifiedVersion | cut -d. -f2)
-  
-          version=$(curl -s "https://api.openshift.com/api/upgrades_info/v1/graph?channel=fast-4.16" | jq -r ".nodes[].version" | sort -V --rev | head -n1)
-          
-          ./oc adm release extract --credentials-requests --to /tmp/credreqs "quay.io/openshift-release-dev/ocp-release:$verifiedYVersion-x86_64"
+          OCP_VERSION=4.14.37 OC=./oc make validate-roledef
         displayName: Run check
         target: container
diff --git a/Makefile b/Makefile
index 99c2cdeeda2..61c7200c553 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ ARO_IMAGE_BASE = ${RP_IMAGE_ACR}.azurecr.io/aro
 E2E_FLAGS ?= -test.v --ginkgo.v --ginkgo.timeout 180m --ginkgo.flake-attempts=2 --ginkgo.junit-report=e2e-report.xml
 E2E_LABEL ?= !smoke
 GO_FLAGS ?= -tags=containers_image_openpgp,exclude_graphdriver_btrfs,exclude_graphdriver_devicemapper
+OC ?= oc
 
 export GOFLAGS=$(GO_FLAGS)
 
@@ -539,3 +540,7 @@ run-rp: ci-rp podman-secrets
 		--secret proxy-client.crt,target=/app/secrets/proxy-client.crt \
 		--secret proxy.crt,target=/app/secrets/proxy.crt \
 		$(LOCAL_ARO_RP_IMAGE):$(VERSION) rp
+
+.PHONY: validate-roledef
+validate-roledef:
+	go run ./hack/role -verified-version $(OCP_VERSION) -oc-bin=$(OC)
\ No newline at end of file