diff --git a/Dockerfile b/Dockerfile
index 3d70e4fa..8b1fe8c1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ COPY go.sum go.sum
 
 RUN \
     # get Go version from mod file
-    export GO_VERSION=$(grep -E "go [[:digit:]]\.[[:digit:]][[:digit:]]" go.mod | awk '{print $2}') && \
+    export GO_VERSION=$(grep -oE "go [[:digit:]]\.[[:digit:]][[:digit:]]" go.mod | awk '{print $2}') && \
     echo ${GO_VERSION} && \
     # find filename for latest z version from Go download page
     export GO_FILENAME=$(curl -sL 'https://go.dev/dl/?mode=json&include=all' | jq -r "[.[] | select(.version | startswith(\"go${GO_VERSION}\"))][0].files[] | select(.os == \"linux\" and .arch == \"amd64\") | .filename") && \
diff --git a/Makefile b/Makefile
index 9273484e..b0f7a8bb 100755
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ ENVTEST_VERSION ?= v0.0.0-20240112123317-48d9a7b44e54
 # See https://pkg.go.dev/golang.org/x/tools/cmd/goimports?tab=versions for the last version
 GOIMPORTS_VERSION ?= v0.17.0
 # See https://github.com/onsi/ginkgo/releases for the last version
-GINKGO_VERSION ?= v2.14.0
+GINKGO_VERSION ?= v2.22.0
 # See github.com/operator-framework/operator-registry/releases for the last version
 OPM_VERSION ?= v1.35.0
 # See github.com/operator-framework/operator-sdk/releases for the last version
diff --git a/go.mod b/go.mod
index 8667bd1b..8980ab62 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/medik8s/node-maintenance-operator
 
-go 1.23
+go 1.23.0
 
 require (
 	github.com/go-logr/logr v1.4.2