diff --git a/.github/workflows/build-service-images.yml b/.github/workflows/build-service-images.yml
index d580b1e..e36dfd6 100644
--- a/.github/workflows/build-service-images.yml
+++ b/.github/workflows/build-service-images.yml
@@ -56,9 +56,9 @@ env:
   ORG: cloud-neutral-toolkit
 
   # Base image references (tag or digest)
-  GO_RUNTIME_IMAGE: ${{ inputs.go_runtime_image || github.event.inputs.go_runtime_image || 'ghcr.io/cloud-neutral-toolkit/go-runtime:latest' }}
-  NODE_BUILDER_IMAGE: ${{ inputs.node_builder_image || github.event.inputs.node_builder_image || 'ghcr.io/cloud-neutral-toolkit/node-builder:latest' }}
-  NODE_RUNTIME_IMAGE: ${{ inputs.node_runtime_image || github.event.inputs.node_runtime_image || 'ghcr.io/cloud-neutral-toolkit/node-runtime:latest' }}
+  GO_RUNTIME_IMAGE: ${{ inputs.go_runtime_image || github.event.inputs.go_runtime_image || 'golang:1.25' }}
+  NODE_BUILDER_IMAGE: ${{ inputs.node_builder_image || github.event.inputs.node_builder_image || 'node:22-bookworm' }}
+  NODE_RUNTIME_IMAGE: ${{ inputs.node_runtime_image || github.event.inputs.node_runtime_image || 'node:22-slim' }}
 
 
   # Push control