diff --git a/cluster/cluster.sh b/cluster/cluster.sh
index d51e9dc7..93a825a8 100755
--- a/cluster/cluster.sh
+++ b/cluster/cluster.sh
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 export KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-'k8s-1.26-centos9'}
-export KUBEVIRTCI_TAG=2305081329-48e913c
+export KUBEVIRTCI_TAG=${KUBEVIRTCI_TAG:-2305081329-48e913c}
 
 KUBEVIRTCI_REPO='https://github.com/kubevirt/kubevirtci.git'
 # The CLUSTER_PATH var is used in cluster folder and points to the _kubevirtci where the cluster is deployed from.
diff --git a/cmd/Dockerfile b/cmd/Dockerfile
index 023b6ba2..fa677e40 100644
--- a/cmd/Dockerfile
+++ b/cmd/Dockerfile
@@ -4,7 +4,15 @@ RUN mkdir /workdir
 WORKDIR /workdir
 
 COPY go.mod .
-RUN dnf install -y golang-$(sed -En 's/^go +(.*+)$/\1/p' go.mod).*
+
+RUN dnf install -y wget
+
+RUN GO_VERSION=$(sed -En 's/^go +(.*)$/\1/p' go.mod) && \
+    wget https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz && \
+    tar -C /usr/local -xzf go${GO_VERSION}.linux-amd64.tar.gz && \
+    rm go${GO_VERSION}.linux-amd64.tar.gz
+
+ENV PATH /usr/local/go/bin:$PATH
 
 COPY . .
 
diff --git a/go.mod b/go.mod
index 4ce985cd..6b688b69 100644
--- a/go.mod
+++ b/go.mod
@@ -87,4 +87,4 @@ replace (
 	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.1
 )
 
-go 1.21
+go 1.21.0