diff --git a/images/cdi-artifact/werf.inc.yaml b/images/cdi-artifact/werf.inc.yaml
index a5c0c950b6..11de97a856 100644
--- a/images/cdi-artifact/werf.inc.yaml
+++ b/images/cdi-artifact/werf.inc.yaml
@@ -109,7 +109,7 @@ shell:
 ---
 image: {{ $.ImageName }}-cbuilder
 final: false
-fromImage: builder/golang-bookworm-1.23
+fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.23" "builder/alt-go-svace" }}
 git:
   - add: /images/{{ $.ImageName }}/static_binaries
     to: /
@@ -118,14 +118,21 @@ git:
         - '*.c'
 shell:
   install:
+{{- if eq $.SVACE_ENABLED "false" }}
   {{- include "debian packages proxy" . | nindent 2 }}
-  - |
-    apt-get install --yes musl-dev musl-tools
+  - apt-get install --yes musl-dev musl-tools
   {{- include "debian packages clean" . | nindent 2 }}
+{{- else }}
+  {{- include "alt packages proxy" . | nindent 2 }}
+  - apt-get -qq install -y musl-devel musl-devel-static
+  {{- include "alt packages clean" . | nindent 2 }}
+{{- end }}
   - |
     echo "Building simple app that prints hello cdi"
     mkdir -p /bins
-    musl-gcc -static -Os -o /bins/hello hello.c
-    musl-gcc -static -Os -o /bins/printFile print_file_context.c
+    {{- $_ := set $ "ProjectName" (list $.ImageName "hello" | join "/") }}
+    {{- include "image-build.build" (set $ "BuildCommand" `musl-gcc -static -Os -o /bins/hello hello.c`) | nindent 6 }}
+    {{- $_ := set $ "ProjectName" (list $.ImageName "printFile" | join "/") }}
+    {{- include "image-build.build" (set $ "BuildCommand" `musl-gcc -static -Os -o /bins/printFile print_file_context.c`) | nindent 6 }}
     strip /bins/hello
     strip /bins/printFile
diff --git a/images/cdi-cloner/werf.inc.yaml b/images/cdi-cloner/werf.inc.yaml
index a76e17dd46..aeb345301a 100644
--- a/images/cdi-cloner/werf.inc.yaml
+++ b/images/cdi-cloner/werf.inc.yaml
@@ -51,7 +51,7 @@ shell:
 ---
 image: {{ $.ImageName }}-gobuild
 final: false
-fromImage: builder/golang-bookworm-1.23
+fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.23" "builder/alt-go-svace" }}
 git:
   - add: /images/{{ $.ImageName }}/cloner-startup
     to: /app
@@ -63,4 +63,5 @@ shell:
   - |
     mkdir -p /cdi-binaries
     cd /app
-    go build -ldflags="-s -w" -o /cdi-binaries/cloner-startup ./cmd/cloner-startup
+    {{- $_ := set $ "ProjectName" (list $.ImageName "cdi-cloner" | join "/") }}
+    {{- include "image-build.build" (set $ "BuildCommand" `go build -ldflags="-s -w" -o /cdi-binaries/cloner-startup ./cmd/cloner-startup`) | nindent 6 }}
diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml
index 6d59ce70d7..f7ca36b4b8 100644
--- a/images/virt-launcher/werf.inc.yaml
+++ b/images/virt-launcher/werf.inc.yaml
@@ -461,7 +461,7 @@ shell:
 ---
 image: {{ $.ImageName }}-cbuilder
 final: false
-fromImage: builder/golang-bookworm-1.23
+fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.23" "builder/alt-go-svace" }}
 git:
   - add: /images/{{ $.ImageName }}/static_binaries
     to: /
@@ -470,12 +470,20 @@ git:
         - '*.c'
 shell:
   beforeInstall:
+{{- if eq $.SVACE_ENABLED "false" }}
   {{- include "debian packages proxy" . | nindent 2 }}
   - apt-get install --yes musl-dev musl-tools
   {{- include "debian packages clean" . | nindent 2 }}
+{{- else }}
+  {{- include "alt packages proxy" . | nindent 2 }}
+  - apt-get -qq install -y musl-devel musl-devel-static
+  {{- include "alt packages clean" . | nindent 2 }}
+{{- end }}
   install:
   - |
     echo "Building simple app that prints I'am temp pod"
     mkdir -p /bins
-    musl-gcc -static -Os -o /bins/temp_pod temp_pod.c
+
+    {{- $_ := set $ "ProjectName" (list $.ImageName "temp_pod" | join "/") }}
+    {{- include "image-build.build" (set $ "BuildCommand" `musl-gcc -static -Os -o /bins/temp_pod temp_pod.c`) | nindent 6 }}
     strip /bins/temp_pod