diff --git a/common/jenkins-agents/golang/docker/Dockerfile.ubi8 b/common/jenkins-agents/golang/docker/Dockerfile.ubi8
index ddce90457..2745e46bd 100644
--- a/common/jenkins-agents/golang/docker/Dockerfile.ubi8
+++ b/common/jenkins-agents/golang/docker/Dockerfile.ubi8
@@ -2,7 +2,8 @@ FROM opendevstackorg/ods-jenkins-agent-base-ubi8:latest
 
 LABEL maintainer="Michael Sauter <michael.sauter@boehringer-ingelheim.com>"
 
-ARG goDistributionUrl
+ARG goDistributionUrl=https://go.dev/dl/go1.21.3.linux-amd64.tar.gz
+ARG golangciVersion=v1.54.2
 
 RUN yum install -y gcc gcc-c++
 
@@ -18,7 +19,7 @@ ENV PATH $PATH:/usr/local/go/bin
 ENV GOBIN /usr/local/bin
 
 COPY install-golangci-lint.sh /tmp/install-golangci-lint.sh
-RUN /tmp/install-golangci-lint.sh -b /usr/local/bin v1.52.2 && \
+RUN /tmp/install-golangci-lint.sh -b /usr/local/bin $golangciVersion && \
     rm -f /tmp/install-golangci-lint.sh
 
 RUN go install github.com/jstemmer/go-junit-report/v2@v2.0.0