diff --git a/dist/nanometrics-agent-linux-amd64 b/dist/nanometrics-agent-linux-amd64
index 34c6067..1fc083b 100755
Binary files a/dist/nanometrics-agent-linux-amd64 and b/dist/nanometrics-agent-linux-amd64 differ
diff --git a/dist/nanometrics-agent-linux-arm64 b/dist/nanometrics-agent-linux-arm64
index 859165e..c04bbcd 100755
Binary files a/dist/nanometrics-agent-linux-arm64 and b/dist/nanometrics-agent-linux-arm64 differ
diff --git a/server/Dockerfile b/server/Dockerfile
index 52fd38f..484de11 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,4 +1,5 @@
-FROM golang:1.22-alpine AS builder
+ARG GO_IMAGE=public.ecr.aws/docker/library/golang:1.25-alpine
+FROM ${GO_IMAGE} AS builder
 WORKDIR /app
 COPY go.mod go.sum ./
 RUN go mod download
diff --git a/server/Dockerfile.dev b/server/Dockerfile.dev
index f49c35a..997affb 100644
--- a/server/Dockerfile.dev
+++ b/server/Dockerfile.dev
@@ -1,5 +1,6 @@
 # Dockerfile de dev : utilise le binaire pré-compilé localement (pas de pull Docker Hub)
-FROM nginx:alpine
+ARG NGINX_IMAGE=public.ecr.aws/docker/library/nginx:alpine
+FROM ${NGINX_IMAGE}
 COPY nanometrics-server /app/nanometrics-server
 WORKDIR /app
 VOLUME /data
diff --git a/server/docker-compose.dev.yml b/server/docker-compose.dev.yml
index bcaceb5..b915b69 100644
--- a/server/docker-compose.dev.yml
+++ b/server/docker-compose.dev.yml
@@ -15,7 +15,7 @@ services:
       - "9999:9999/udp"
 
   dashboard:
-    image: nginx:alpine
+    image: ${NGINX_IMAGE:-public.ecr.aws/docker/library/nginx:alpine}
     restart: unless-stopped
     volumes:
       - ./nginx/nginx.conf:/etc/nginx/conf.d/default.conf:ro
diff --git a/server/docker-compose.yml b/server/docker-compose.yml
index 3e9d9cc..7637887 100644
--- a/server/docker-compose.yml
+++ b/server/docker-compose.yml
@@ -3,6 +3,8 @@ services:
     build:
       context: .
       pull: false
+      args:
+        GO_IMAGE: ${GO_IMAGE:-public.ecr.aws/docker/library/golang:1.25-alpine}
     restart: unless-stopped
     environment:
       UDP_ADDR: "0.0.0.0:9999"
@@ -16,7 +18,7 @@ services:
       - "9999:9999/udp"
 
   dashboard:
-    image: nginx:alpine
+    image: ${NGINX_IMAGE:-public.ecr.aws/docker/library/nginx:alpine}
     pull_policy: if_not_present
     restart: unless-stopped
     volumes: