diff --git a/github/ci/prow-deploy/files/jobs/nmstate/kubernetes-nmstate/kubernetes-nmstate-postsubmits.yaml b/github/ci/prow-deploy/files/jobs/nmstate/kubernetes-nmstate/kubernetes-nmstate-postsubmits.yaml
index 5f7796fb97..5736652307 100644
--- a/github/ci/prow-deploy/files/jobs/nmstate/kubernetes-nmstate/kubernetes-nmstate-postsubmits.yaml
+++ b/github/ci/prow-deploy/files/jobs/nmstate/kubernetes-nmstate/kubernetes-nmstate-postsubmits.yaml
@@ -30,9 +30,8 @@ postsubmits:
               value: kubevirt-bot
             - name: GITHUB_EMAIL
               value: kubevirtbot@redhat.com
-            - name: GIMME_GO_VERSION
-              value: "1.16"
             command:
+              - "export GIMME_GO_VERSION=`grep '^go' go.mod |sed 's/go //'`"
               - "/usr/local/bin/runner.sh"
               - "/bin/bash"
               - "-c"
@@ -74,9 +73,8 @@ postsubmits:
               value: kubevirt-bot
             - name: GITHUB_EMAIL
               value: kubevirtbot@redhat.com
-            - name: GIMME_GO_VERSION
-              value: "1.16"
             command:
+              - "export GIMME_GO_VERSION=`grep '^go' go.mod |sed 's/go //'`"
               - "/usr/local/bin/runner.sh"
               - "/bin/bash"
               - "-c"
diff --git a/github/ci/prow-deploy/files/jobs/nmstate/kubernetes-nmstate/kubernetes-nmstate-presubmits.yaml b/github/ci/prow-deploy/files/jobs/nmstate/kubernetes-nmstate/kubernetes-nmstate-presubmits.yaml
index af8bf3553a..532e09e879 100644
--- a/github/ci/prow-deploy/files/jobs/nmstate/kubernetes-nmstate/kubernetes-nmstate-presubmits.yaml
+++ b/github/ci/prow-deploy/files/jobs/nmstate/kubernetes-nmstate/kubernetes-nmstate-presubmits.yaml
@@ -23,10 +23,11 @@ presubmits:
           - image: quay.io/kubevirtci/golang:v20220110-c066ff5
             securityContext:
               privileged: true
-            env:
-              - name: GIMME_GO_VERSION
-                value: "1.16"
             command:
+              - "/bin/bash"
+            args:
+              - "-c"
+              - "export GIMME_GO_VERSION=$(grep '^go' go.mod |sed 's/go //')"
               - "/usr/local/bin/runner.sh"
               - "/bin/sh"
               - "-c"
@@ -58,10 +59,8 @@ presubmits:
             resources:
               requests:
                 memory: "29Gi"
-            env:
-              - name: GIMME_GO_VERSION
-                value: "1.16"
             command:
+              - "export GIMME_GO_VERSION=`grep '^go' go.mod |sed 's/go //'`"
               - "/usr/local/bin/runner.sh"
               - "/bin/sh"
               - "-c"
@@ -94,10 +93,8 @@ presubmits:
             resources:
               requests:
                 memory: "29Gi"
-            env:
-              - name: GIMME_GO_VERSION
-                value: "1.16"
             command:
+              - "export GIMME_GO_VERSION=`grep '^go' go.mod |sed 's/go //'`"
               - "/usr/local/bin/runner.sh"
               - "/bin/sh"
               - "-c"
@@ -160,10 +157,8 @@ presubmits:
             resources:
               requests:
                 memory: "29Gi"
-            env:
-              - name: GIMME_GO_VERSION
-                value: "1.16"
             command:
+              - "export GIMME_GO_VERSION=`grep '^go' go.mod |sed 's/go //'`"
               - "/usr/local/bin/runner.sh"
               - "/bin/sh"
               - "-c"