diff --git a/Dockerfile b/Dockerfile
index 3598f54e..3533e3a7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,8 +2,10 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+ARG TARGET_GO_VERSION=1.25.1
+
 # Build the manager binary
-FROM --platform=$BUILDPLATFORM golang:1.25.1 AS builder
+FROM --platform=$BUILDPLATFORM golang:${TARGET_GO_VERSION} AS builder
 ARG TARGETOS TARGETARCH
 ARG BININFO_BUILD_DATE BININFO_COMMIT_HASH BININFO_VERSION
 
@@ -33,7 +35,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
 
 
 # Debug image (with Delve, non-distroless)
-FROM --platform=$BUILDPLATFORM golang:1.24.4 AS debug
+FROM --platform=$BUILDPLATFORM golang:${TARGET_GO_VERSION} AS debug
 ARG BININFO_BUILD_DATE BININFO_COMMIT_HASH BININFO_VERSION
 LABEL source_repository="https://github.com/sapcc/argora" \
   org.opencontainers.image.url="https://github.com/sapcc/argora" \
diff --git a/Tiltfile b/Tiltfile
index ac36b9a1..aca8e3af 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -48,7 +48,8 @@ if target == 'debug':
         'controller:latest',
         '.',
         target=target,
-        entrypoint='dlv exec /manager --headless --listen=:3000 --accept-multiclient --continue --',
+        # Forward all container args (including the first, which is $0 under sh -c) to the manager
+        entrypoint='set -- "$0" "$@"; exec dlv exec /manager --headless --listen=:3000 --accept-multiclient --continue -- "$@"',
         build_args=build_args
     )
 else: