diff --git a/Taskfile.yml b/Taskfile.yml
index e6b20db..a4755b1 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -7,7 +7,7 @@ output: prefixed
 # Variables that are shared across tasks.
 vars:
   GO_VERSION:
-    sh: sed -n 's/^toolchain go//p' go.mod
+    sh: sed -n 's/^toolchain go//p' go.mod | grep . || sed -n 's/^go //p' go.mod
   # renovate: datasource=docker depName=kindest/node versioning=semver
   E2E_KUBERNETES_VERSION: v1.35.1
   E2E_CLUSTER_NAME: barman-cloud-plugin-e2e-{{.E2E_KUBERNETES_VERSION}}
diff --git a/containers/Dockerfile.plugin b/containers/Dockerfile.plugin
index 8fc17e6..804ee22 100644
--- a/containers/Dockerfile.plugin
+++ b/containers/Dockerfile.plugin
@@ -1,5 +1,5 @@
 # Build the manager binary
-# GO_VERSION must be passed as a build arg (read from go.mod toolchain directive by Taskfile)
+# GO_VERSION must be passed as a build arg (read from go.mod by Taskfile)
 ARG GO_VERSION
 FROM --platform=$BUILDPLATFORM golang:${GO_VERSION} AS gobuilder
 ARG TARGETOS
diff --git a/containers/Dockerfile.sidecar b/containers/Dockerfile.sidecar
index b62d3e1..3970bba 100644
--- a/containers/Dockerfile.sidecar
+++ b/containers/Dockerfile.sidecar
@@ -5,7 +5,7 @@
 # Both components are built before going into a distroless container
 
 # Build the manager binary
-# GO_VERSION must be passed as a build arg (read from go.mod toolchain directive by Taskfile)
+# GO_VERSION must be passed as a build arg (read from go.mod by Taskfile)
 ARG GO_VERSION
 FROM --platform=$BUILDPLATFORM golang:${GO_VERSION} AS gobuilder
 ARG TARGETOS