diff --git a/backend/Dockerfile b/backend/Dockerfile
index 7cab5e27..5919a05e 100755
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22 as builder
+FROM golang:1.23 as builder
 
 # Add files
 RUN mkdir /app
@@ -14,9 +14,8 @@ ADD ./go-app/go.mod /app
 RUN wget -O /app_sdk/app_base.py https://raw.githubusercontent.com/Shuffle/app_sdk/refs/heads/main/shuffle_sdk/shuffle_sdk.py
 ADD ./app_gen /app_gen
 
-RUN go get -v
-#RUN go mod tidy
-#RUN go clean -modcache
+RUN go mod download
+RUN go mod tidy
 
 # From November 2022, CGO is enabled due to packages
 # that we use requiring it. This is a temporary fix
diff --git a/functions/onprem/orborus/Dockerfile b/functions/onprem/orborus/Dockerfile
index 023cdf8f..921514b0 100644
--- a/functions/onprem/orborus/Dockerfile
+++ b/functions/onprem/orborus/Dockerfile
@@ -1,11 +1,13 @@
-FROM golang:1.22 as builder
+FROM golang:1.23 as builder
 
 WORKDIR /app
 
 COPY orborus.go /app/orborus.go
 COPY go.mod /app/go.mod
 
-RUN go get
+#RUN go get
+RUN go mod download
+RUN go mod tidy 
 #RUN go build -v
 
 # Enabled CGO January 2025 (?)
diff --git a/functions/onprem/worker/Dockerfile b/functions/onprem/worker/Dockerfile
index 019e0fc7..a2fb13b3 100755
--- a/functions/onprem/worker/Dockerfile
+++ b/functions/onprem/worker/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22 as builder
+FROM golang:1.23 as builder
 
 WORKDIR /app
 #RUN go get github.com/docker/docker/api/types github.com/docker/docker/api/types/container github.com/docker/docker/client
@@ -9,7 +9,8 @@ COPY go.mod /app/go.mod
 #COPY go.sum /app/go.sum
 #RUN go
 #COPY go.sum /app/go.sum
-RUN go get
+RUN go mod download 
+RUN go mod tidy 
 
 #RUN go mod init worker
 #RUN go get