diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml
index 35939a3..812d894 100644
--- a/.woodpecker/build.yaml
+++ b/.woodpecker/build.yaml
@@ -1,3 +1,8 @@
+matrix:
+  GO_VERSION:
+    - 1.24
+    - 1.23
+
 when:
     - event: [push, manual]
 
@@ -6,7 +11,7 @@ steps:
     image: woodpeckerci/plugin-kaniko
     settings:
       registry: ${CI_FORGE_URL##https://}
-      repo: ${CI_REPO_OWNER}/${CI_REPO_NAME}
+      repo: ${CI_REPO_OWNER}/${CI_REPO_NAME}:${GO_VERSION}
       username:
         from_secret: forge-username
       password:
diff --git a/Dockerfile b/Dockerfile
index 0c03a1a..f46f0ec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.24
+FROM golang:${GO_VERSION}
 
 COPY entrypoint.sh /entrypoint.sh