diff --git a/sjb/config/test_cases/test_branch_origin_extended_conformance_crio.yml b/sjb/config/test_cases/test_branch_origin_extended_conformance_crio.yml
index b62ac2a0e1..6b8e05e619 100644
--- a/sjb/config/test_cases/test_branch_origin_extended_conformance_crio.yml
+++ b/sjb/config/test_cases/test_branch_origin_extended_conformance_crio.yml
@@ -93,7 +93,7 @@ extensions:
       title: "origin prerequisites"
       repository: "aos-cd-jobs"
       script: |-
-        crio_tag="$( cat ./ORIGIN_PKG_VERSION | grep -Po '\d.\d' )"
+        crio_tag="$( grep -Po "(?<=^-)[0-9]+\.[0-9]+" ./ORIGIN_PKG_VERSION  )"
         case $crio_tag in
         "3.7")
           crio_image="docker.io/runcom/cri-o-system-container:v3.7"
@@ -134,7 +134,7 @@ extensions:
         else
             playbook="${playbook_base}byo/openshift-node/network_manager.yml"
         fi
-        crio_tag="$( cat ./ORIGIN_PKG_VERSION | grep -Po '\d.\d' )"
+        crio_tag="$( grep -Po "(?<=^-)[0-9]+\.[0-9]+" ./ORIGIN_PKG_VERSION  )"
         case $crio_tag in
         "3.7")
           crio_image="docker.io/runcom/cri-o-system-container:v3.7"
diff --git a/sjb/generated/test_branch_origin_extended_conformance_crio.xml b/sjb/generated/test_branch_origin_extended_conformance_crio.xml
index dd73d212d1..bbc491c0a3 100644
--- a/sjb/generated/test_branch_origin_extended_conformance_crio.xml
+++ b/sjb/generated/test_branch_origin_extended_conformance_crio.xml
@@ -529,7 +529,7 @@ cat &lt;&lt;SCRIPT &gt;&#34;${script}&#34;
 #!/bin/bash
 set -o errexit -o nounset -o pipefail -o xtrace
 cd &#34;\${GOPATH}/src/github.com/openshift/aos-cd-jobs&#34;
-crio_tag=&#34;\$( cat ./ORIGIN_PKG_VERSION | grep -Po &#39;\d.\d&#39; )&#34;
+crio_tag=&#34;\$( grep -Po &#34;(?&lt;=^-)[0-9]+\.[0-9]+&#34; ./ORIGIN_PKG_VERSION  )&#34;
 case \$crio_tag in
 &#34;3.7&#34;)
   crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.7&#34;
@@ -578,7 +578,7 @@ if [[ -s &#34;\${playbook_base}/openshift-node/network_manager.yml&#34; ]]; then
 else
     playbook=&#34;\${playbook_base}byo/openshift-node/network_manager.yml&#34;
 fi
-crio_tag=&#34;\$( cat ./ORIGIN_PKG_VERSION | grep -Po &#39;\d.\d&#39; )&#34;
+crio_tag=&#34;\$( grep -Po &#34;(?&lt;=^-)[0-9]+\.[0-9]+&#34; ./ORIGIN_PKG_VERSION  )&#34;
 case \$crio_tag in
 &#34;3.7&#34;)
   crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.7&#34;
diff --git a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_crio.xml b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_crio.xml
index 17109eb4b3..f3a17702f6 100644
--- a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_crio.xml
+++ b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_crio.xml
@@ -629,7 +629,7 @@ cat &lt;&lt;SCRIPT &gt;&#34;${script}&#34;
 #!/bin/bash
 set -o errexit -o nounset -o pipefail -o xtrace
 cd &#34;\${GOPATH}/src/github.com/openshift/aos-cd-jobs&#34;
-crio_tag=&#34;\$( cat ./ORIGIN_PKG_VERSION | grep -Po &#39;\d.\d&#39; )&#34;
+crio_tag=&#34;\$( grep -Po &#34;(?&lt;=^-)[0-9]+\.[0-9]+&#34; ./ORIGIN_PKG_VERSION  )&#34;
 case \$crio_tag in
 &#34;3.7&#34;)
   crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.7&#34;
@@ -678,7 +678,7 @@ if [[ -s &#34;\${playbook_base}/openshift-node/network_manager.yml&#34; ]]; then
 else
     playbook=&#34;\${playbook_base}byo/openshift-node/network_manager.yml&#34;
 fi
-crio_tag=&#34;\$( cat ./ORIGIN_PKG_VERSION | grep -Po &#39;\d.\d&#39; )&#34;
+crio_tag=&#34;\$( grep -Po &#34;(?&lt;=^-)[0-9]+\.[0-9]+&#34; ./ORIGIN_PKG_VERSION  )&#34;
 case \$crio_tag in
 &#34;3.7&#34;)
   crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.7&#34;
diff --git a/sjb/generated/test_pull_request_origin_extended_conformance_crio.xml b/sjb/generated/test_pull_request_origin_extended_conformance_crio.xml
index 5cdf7249e9..363e749293 100644
--- a/sjb/generated/test_pull_request_origin_extended_conformance_crio.xml
+++ b/sjb/generated/test_pull_request_origin_extended_conformance_crio.xml
@@ -629,7 +629,7 @@ cat &lt;&lt;SCRIPT &gt;&#34;${script}&#34;
 #!/bin/bash
 set -o errexit -o nounset -o pipefail -o xtrace
 cd &#34;\${GOPATH}/src/github.com/openshift/aos-cd-jobs&#34;
-crio_tag=&#34;\$( cat ./ORIGIN_PKG_VERSION | grep -Po &#39;\d.\d&#39; )&#34;
+crio_tag=&#34;\$( grep -Po &#34;(?&lt;=^-)[0-9]+\.[0-9]+&#34; ./ORIGIN_PKG_VERSION  )&#34;
 case \$crio_tag in
 &#34;3.7&#34;)
   crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.7&#34;
@@ -678,7 +678,7 @@ if [[ -s &#34;\${playbook_base}/openshift-node/network_manager.yml&#34; ]]; then
 else
     playbook=&#34;\${playbook_base}byo/openshift-node/network_manager.yml&#34;
 fi
-crio_tag=&#34;\$( cat ./ORIGIN_PKG_VERSION | grep -Po &#39;\d.\d&#39; )&#34;
+crio_tag=&#34;\$( grep -Po &#34;(?&lt;=^-)[0-9]+\.[0-9]+&#34; ./ORIGIN_PKG_VERSION  )&#34;
 case \$crio_tag in
 &#34;3.7&#34;)
   crio_image=&#34;docker.io/runcom/cri-o-system-container:v3.7&#34;