diff --git a/build/Dockerfile b/build/Dockerfile
index 78a48ee3..7e77e3c1 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,7 +1,7 @@
 # ---
 # Stage 1: Install certs, build binary, create default config file
 # ---
-FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.22 AS builder
+FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.23 AS builder
 
 ARG TARGETOS
 ARG TARGETARCH
diff --git a/build/Dockerfile-conformance b/build/Dockerfile-conformance
index 6878935c..efb40175 100644
--- a/build/Dockerfile-conformance
+++ b/build/Dockerfile-conformance
@@ -1,7 +1,7 @@
 # ---
 # Stage 1: Install certs, build binary, create default config file
 # ---
-FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.22 AS builder
+FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.23 AS builder
 
 ARG TARGETOS
 ARG TARGETARCH
diff --git a/build/Dockerfile-minimal b/build/Dockerfile-minimal
index 789bcca6..2a367f8c 100644
--- a/build/Dockerfile-minimal
+++ b/build/Dockerfile-minimal
@@ -1,7 +1,7 @@
 # ---
 # Stage 1: Install certs, build binary, create default config file
 # ---
-FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.22 AS builder
+FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.23 AS builder
 
 ARG TARGETOS
 ARG TARGETARCH
diff --git a/build/Dockerfile-zb b/build/Dockerfile-zb
index 34ea763e..80e916e2 100644
--- a/build/Dockerfile-zb
+++ b/build/Dockerfile-zb
@@ -1,7 +1,7 @@
 # ---
 # Stage 1: Install certs, build binary, create default config file
 # ---
-FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.22 AS builder
+FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.23 AS builder
 
 ARG TARGETOS
 ARG TARGETARCH
diff --git a/build/Dockerfile-zxp b/build/Dockerfile-zxp
index b37db033..dde0d25b 100644
--- a/build/Dockerfile-zxp
+++ b/build/Dockerfile-zxp
@@ -1,7 +1,7 @@
 # ---
 # Stage 1: Build binary, create default config file
 # ---
-FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.22 AS builder
+FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.23 AS builder
 
 ARG TARGETOS
 ARG TARGETARCH
diff --git a/build/stacker-conformance.yaml b/build/stacker-conformance.yaml
index 8beb8569..9e156a7c 100644
--- a/build/stacker-conformance.yaml
+++ b/build/stacker-conformance.yaml
@@ -1,7 +1,7 @@
 build:
   from:
     type: docker
-    url: docker://ghcr.io/project-zot/golang:1.22
+    url: docker://ghcr.io/project-zot/golang:1.23
   binds:
     - ../. -> /zotcopy
   run: |
diff --git a/build/stacker-minimal.yaml b/build/stacker-minimal.yaml
index dd90f347..64e75b28 100644
--- a/build/stacker-minimal.yaml
+++ b/build/stacker-minimal.yaml
@@ -1,7 +1,7 @@
 build:
   from:
     type: docker
-    url: docker://ghcr.io/project-zot/golang:1.22
+    url: docker://ghcr.io/project-zot/golang:1.23
   binds:
     - ../. -> /zotcopy
   run: |
diff --git a/build/stacker-zb.yaml b/build/stacker-zb.yaml
index 7db9c6b1..36573ad0 100644
--- a/build/stacker-zb.yaml
+++ b/build/stacker-zb.yaml
@@ -1,7 +1,7 @@
 build:
   from:
     type: docker
-    url: docker://ghcr.io/project-zot/golang:1.22
+    url: docker://ghcr.io/project-zot/golang:1.23
   binds:
     - ../. -> /zotcopy
   run: |
diff --git a/build/stacker-zxp.yaml b/build/stacker-zxp.yaml
index e39dcdb7..34aaa83f 100644
--- a/build/stacker-zxp.yaml
+++ b/build/stacker-zxp.yaml
@@ -1,7 +1,7 @@
 build:
   from:
     type: docker
-    url: docker://ghcr.io/project-zot/golang:1.22
+    url: docker://ghcr.io/project-zot/golang:1.23
   binds:
     - ../. -> /zotcopy
   run: |
diff --git a/build/stacker.yaml b/build/stacker.yaml
index b1028d4a..12e1a414 100644
--- a/build/stacker.yaml
+++ b/build/stacker.yaml
@@ -1,7 +1,7 @@
 build:
   from:
     type: docker
-    url: docker://ghcr.io/project-zot/golang:1.22
+    url: docker://ghcr.io/project-zot/golang:1.23
   binds:
     - ../. -> /zotcopy
   run: |
diff --git a/test/blackbox/restore_s3_blobs.bats b/test/blackbox/restore_s3_blobs.bats
index 55758541..87f7a782 100644
--- a/test/blackbox/restore_s3_blobs.bats
+++ b/test/blackbox/restore_s3_blobs.bats
@@ -131,7 +131,7 @@ function teardown_file() {
 
     start=`date +%s`
     echo "waiting for restoring blobs task to finish" >&3
-    run wait_for_string "no digests left, finished" ${ZOT_LOG_FILE} "5m"
+    run wait_for_string "no digests left, finished" ${ZOT_LOG_FILE} "6m"
     [ "$status" -eq 0 ]
 
     end=`date +%s`