diff --git a/.werf/images.yaml b/.werf/images.yaml
index d9259b8048..f52f7f0126 100644
--- a/.werf/images.yaml
+++ b/.werf/images.yaml
@@ -39,7 +39,6 @@ dockerfile: Dockerfile
   {{- $_ := set $ctx "SVACE_ENABLED" $Root.SVACE_ENABLED }}
   {{- $_ := set $ctx "SVACE_ANALYZE_SSH_USER" $Root.SVACE_ANALYZE_SSH_USER }}
   {{- $_ := set $ctx "SVACE_ANALYZE_HOST" $Root.SVACE_ANALYZE_HOST }}
-  {{- $_ := set $ctx "SVACE_IMAGE_SUFFIX" $Root.SVACE_IMAGE_SUFFIX }}
 
 
   {{- include "module_image_template" $ctx }}
diff --git a/base-images/deckhouse_images.yml b/base-images/deckhouse_images.yml
index f70c51362b..6a35e876d5 100644
--- a/base-images/deckhouse_images.yml
+++ b/base-images/deckhouse_images.yml
@@ -1,95 +1,127 @@
-# version v0.5.2
+# version v0.5.7
 # REGISTRY_PATH is a special key which is concatenated with other base images
 REGISTRY_PATH: registry.deckhouse.io/base_images
-base/distroless: "sha256:831becf5ddff71e75003d8fb6ddf57af1a8f24731fff851960df29d02d65fa4a" # fromImage: builder/scratch
-base/nginx: "sha256:6730948d840c8f3e87ab54ecbfe365f99ab9bf37aaf29c1f84851af68a1483b9" # fromImage: builder/scratch
-base/nginx-release-1.28.0: "sha256:6730948d840c8f3e87ab54ecbfe365f99ab9bf37aaf29c1f84851af68a1483b9" # fromImage: builder/scratch
-base/python: "sha256:bda80f25bbfb09a9e6793a5fcc3a560ebb058ba6618f413a778056951e663461" # fromImage: builder/scratch
-base/python-v3.12.10: "sha256:bda80f25bbfb09a9e6793a5fcc3a560ebb058ba6618f413a778056951e663461" # fromImage: builder/scratch
-builder/alpine: "sha256:286e7fddf397a48ed2529f630881876284ff09c84c6dcfce9d982f4e035648cd" # from: alpine:3.20.6
-builder/alpine-3.20: "sha256:286e7fddf397a48ed2529f630881876284ff09c84c6dcfce9d982f4e035648cd" # from: alpine:3.20.6
-builder/alt: "sha256:7223768d0f8af786c3621de7761075cf6f8f025b3b4bf7edfdceac21038d5fef" # from: registry.altlinux.org/p11/alt:20250321
-builder/alt-2025-04-24: "sha256:7223768d0f8af786c3621de7761075cf6f8f025b3b4bf7edfdceac21038d5fef" # from: registry.altlinux.org/p11/alt:20250321
-builder/golang-alpine: "sha256:f6f526535fdfcdf869a9e09831beeb3ed0d0eac3076a18840dfbfcd1b069c895" # from: golang:1.24.2-alpine3.20
-builder/golang-alpine-1.23: "sha256:68747b189da26bd5bff8f6ec0a9d614940f4d05adcee91ab50b4ee39e335d1c2" # from: golang:1.23.8-alpine3.20
-builder/golang-alpine-1.24: "sha256:f6f526535fdfcdf869a9e09831beeb3ed0d0eac3076a18840dfbfcd1b069c895" # from: golang:1.24.2-alpine3.20
-builder/golang-bookworm: "sha256:a372dbc4eb70c2ee886f4a06bb7e314a7ef46e10c147c97aaef40f2b560e126e" # from: golang:1.24.2-bookworm
-builder/golang-bookworm-1.23: "sha256:917bf6629b807b2cd7bfca6af0ba1d55a6ee776f69ed345a0b8c1673b50f3504" # from: golang:1.23.8-bookworm
-builder/golang-bookworm-1.24: "sha256:a372dbc4eb70c2ee886f4a06bb7e314a7ef46e10c147c97aaef40f2b560e126e" # from: golang:1.24.2-bookworm
-builder/golang-bullseye: "sha256:56b70215b98ad0ffd33c01a12b1712dac7334cfbef584cae3415398dc18d9ee5" # from: golang:1.24.2-bullseye
-builder/golang-bullseye-1.23: "sha256:96b1530ab99f43fa44cf1ac4043b1aa28224ee14922f7ed7b1812371be369a02" # from: golang:1.23.8-bullseye
-builder/golang-bullseye-1.24: "sha256:56b70215b98ad0ffd33c01a12b1712dac7334cfbef584cae3415398dc18d9ee5" # from: golang:1.24.2-bullseye
-builder/node-alpine: "sha256:765e781edaee01b5470b9ccf233a9db46a0496d2d1ff58aff8f7869ffc99807c" # from: node:23.10.0-alpine3.20
-builder/node-alpine-23.10: "sha256:765e781edaee01b5470b9ccf233a9db46a0496d2d1ff58aff8f7869ffc99807c" # from: node:23.10.0-alpine3.20
-builder/scratch: "sha256:f49840da6c92bbe4d3cde773de4b17e31fdf40411028bba2711c2afcd68243d9" # from: registry.werf.io/werf/scratch
-builder/src: "sha256:daa7b7ca4aad077415ad884b6f57ff2670e1b6ac7caa6c2e342ef8e20aa19aad" # fromImage: builder/alt
-libs/bzip2: "sha256:2c4ae2a00e5b66246efec37be04c1554bacc5921b50452253f8bbdbccfdc2571" # fromImage: builder/scratch
-libs/bzip2-bzip2-1.0.8: "sha256:2c4ae2a00e5b66246efec37be04c1554bacc5921b50452253f8bbdbccfdc2571" # fromImage: builder/scratch
-libs/gdbm: "sha256:e2a5f20900f77036ea2515e4a854025511e23752a6135b94a37f73c17bb0714e" # fromImage: builder/scratch
-libs/gdbm-v1.24: "sha256:e2a5f20900f77036ea2515e4a854025511e23752a6135b94a37f73c17bb0714e" # fromImage: builder/scratch
-libs/glibc: "sha256:75c9b8907d9c5c37351687f80c9944017444dfa636c2671a0c1fc88f8e1fd409" # fromImage: builder/scratch
-libs/glibc-v2.41: "sha256:75c9b8907d9c5c37351687f80c9944017444dfa636c2671a0c1fc88f8e1fd409" # fromImage: builder/scratch
-libs/libaio: "sha256:4a5e8aaa19d845035d8b37e58cad1bcb482d03db4f495f77e0d55a93adb77f20" # fromImage: builder/scratch
-libs/libaio-libaio-0.3.113: "sha256:4a5e8aaa19d845035d8b37e58cad1bcb482d03db4f495f77e0d55a93adb77f20" # fromImage: builder/scratch
-libs/libffi: "sha256:2da3aff8074a018501e16841b8d959726646640f5956d5a25fcec16233381826" # fromImage: builder/scratch
-libs/libffi-v3.4.7: "sha256:2da3aff8074a018501e16841b8d959726646640f5956d5a25fcec16233381826" # fromImage: builder/scratch
-libs/libinih: "sha256:c28781ff11a47f7d911b1e022a41981931a5dfbf35742f1f19be17baeac3ea4b" # fromImage: builder/scratch
-libs/libinih-r60: "sha256:c28781ff11a47f7d911b1e022a41981931a5dfbf35742f1f19be17baeac3ea4b" # fromImage: builder/scratch
-libs/musl: "sha256:d24cc8150a1d4994470b9e28b6d1b98bc3dd63632821b15248c3364b45fb9d2b" # fromImage: builder/scratch
-libs/musl-v1.2.5: "sha256:d24cc8150a1d4994470b9e28b6d1b98bc3dd63632821b15248c3364b45fb9d2b" # fromImage: builder/scratch
-libs/ncurses: "sha256:924b4246bd316e3016a39273ef7e932bd0e19becd3e089f759e1e8d1247c4ec9" # fromImage: builder/scratch
-libs/ncurses-v6.5: "sha256:924b4246bd316e3016a39273ef7e932bd0e19becd3e089f759e1e8d1247c4ec9" # fromImage: builder/scratch
-libs/oniguruma: "sha256:e67a0db3a3966a582c028d5201847e6dd080cb655d5154bd8bb3bdb27e0d7bee" # fromImage: builder/scratch
-libs/oniguruma-v6.9.10: "sha256:e67a0db3a3966a582c028d5201847e6dd080cb655d5154bd8bb3bdb27e0d7bee" # fromImage: builder/scratch
-libs/openssl: "sha256:fccef2e4b2429286771a401c3edee79e16c6457950a62ae970c46f7823f2a583" # fromImage: builder/scratch
-libs/openssl-openssl-3.5.0: "sha256:fccef2e4b2429286771a401c3edee79e16c6457950a62ae970c46f7823f2a583" # fromImage: builder/scratch
-libs/pcre2: "sha256:3f979195d79f4a24a46a8d5318c189ec6d4aff807ddb99df17ab22eb18a66bd3" # fromImage: builder/scratch
-libs/pcre2-pcre2-10.45: "sha256:3f979195d79f4a24a46a8d5318c189ec6d4aff807ddb99df17ab22eb18a66bd3" # fromImage: builder/scratch
-libs/readline: "sha256:9e40df8dee2011be9d53b02ff7542a859d929bfe82382a6bd514228c5d863c5b" # fromImage: builder/scratch
-libs/readline-readline-8.2: "sha256:9e40df8dee2011be9d53b02ff7542a859d929bfe82382a6bd514228c5d863c5b" # fromImage: builder/scratch
-libs/skalibs: "sha256:55643fa7c636563175d1dce7a8a3135456b9e48e4962073cc17ea62117e56a0b" # fromImage: builder/scratch
-libs/skalibs-v2.14.3.0: "sha256:55643fa7c636563175d1dce7a8a3135456b9e48e4962073cc17ea62117e56a0b" # fromImage: builder/scratch
-libs/sqlite: "sha256:b5f8b899bf791be6aa33632397984b7d024456645382dfc1c7bd319eb2db5726" # fromImage: builder/scratch
-libs/sqlite-version-3.49.1: "sha256:b5f8b899bf791be6aa33632397984b7d024456645382dfc1c7bd319eb2db5726" # fromImage: builder/scratch
-libs/userspace-rcu: "sha256:8ddeb0c7f8cd59b71908339f02df6b46253b8ca5a8b5c01f01ff2257ada81caa" # fromImage: builder/scratch
-libs/userspace-rcu-v0.15.2: "sha256:8ddeb0c7f8cd59b71908339f02df6b46253b8ca5a8b5c01f01ff2257ada81caa" # fromImage: builder/scratch
-libs/utmps: "sha256:3722d9e7e5a819936ce902ddeb87a65a7dbdbfcf3607fa1081dfb44336f6c940" # fromImage: builder/scratch
-libs/utmps-v0.1.2.3: "sha256:3722d9e7e5a819936ce902ddeb87a65a7dbdbfcf3607fa1081dfb44336f6c940" # fromImage: builder/scratch
-libs/xz: "sha256:4c56bd004f5c6c0eb047d4a58d1865376ff86800531089b5fa79f5bf494948f5" # fromImage: builder/scratch
-libs/xz-v5.8.1: "sha256:4c56bd004f5c6c0eb047d4a58d1865376ff86800531089b5fa79f5bf494948f5" # fromImage: builder/scratch
-libs/zlib: "sha256:2aa24be66a2112515805c585270716376eaa2c1e8e8f8cccc21af9fbea119d96" # fromImage: builder/scratch
-libs/zlib-v1.3.1: "sha256:2aa24be66a2112515805c585270716376eaa2c1e8e8f8cccc21af9fbea119d96" # fromImage: builder/scratch
-tools/bash: "sha256:e6640f7617bdde0b3b1354ec069c7256fe8fdd99bb313b8bfd20681d85f8937a" # fromImage: builder/scratch
-tools/bash-v5.2.37: "sha256:e6640f7617bdde0b3b1354ec069c7256fe8fdd99bb313b8bfd20681d85f8937a" # fromImage: builder/scratch
-tools/coreutils: "sha256:63821b5e36fb60ff3bbb79e38d1ffe3a36dabbdf7a464d1c47370737bc2ff7de" # fromImage: builder/scratch
-tools/coreutils-v9.7: "sha256:63821b5e36fb60ff3bbb79e38d1ffe3a36dabbdf7a464d1c47370737bc2ff7de" # fromImage: builder/scratch
-tools/cosign: "sha256:73db10d16a851b8b4176d75770f8ad2027f8a9612ba08e883e5b65d6f3128e4b" # fromImage: builder/scratch
-tools/cosign-v2.4.3: "sha256:73db10d16a851b8b4176d75770f8ad2027f8a9612ba08e883e5b65d6f3128e4b" # fromImage: builder/scratch
-tools/e2fsprogs: "sha256:63f15cbb81c71f8cece27aeab13f0b258c5f196ab022afea120683c91683259e" # fromImage: builder/scratch
-tools/e2fsprogs-v1.47.2: "sha256:63f15cbb81c71f8cece27aeab13f0b258c5f196ab022afea120683c91683259e" # fromImage: builder/scratch
-tools/findutils: "sha256:45088ca927bdc24b988b506e9745e560994f30d6715b36268a5b91f657e0447e" # fromImage: builder/scratch
-tools/findutils-v4.10.0: "sha256:45088ca927bdc24b988b506e9745e560994f30d6715b36268a5b91f657e0447e" # fromImage: builder/scratch
-tools/gawk: "sha256:16437d8d0fc0eb4b51dbbb7fee74e2cbacb3f9ec487321f2f6b094aa73095377" # fromImage: builder/scratch
-tools/gawk-v5.3.2: "sha256:16437d8d0fc0eb4b51dbbb7fee74e2cbacb3f9ec487321f2f6b094aa73095377" # fromImage: builder/scratch
-tools/grep: "sha256:0fadcc9943de94d782a322f805a70f1e3ca5db1b916f94c8bec4a1d2d6c8a6da" # fromImage: builder/scratch
-tools/grep-grep-3.11: "sha256:0fadcc9943de94d782a322f805a70f1e3ca5db1b916f94c8bec4a1d2d6c8a6da" # fromImage: builder/scratch
-tools/jq: "sha256:ed1960d6d65686957a5817482a4a4beea831a04be3032992aad56561c8b28880" # fromImage: builder/scratch
-tools/jq-jq-1.7.1: "sha256:ed1960d6d65686957a5817482a4a4beea831a04be3032992aad56561c8b28880" # fromImage: builder/scratch
-tools/less: "sha256:758ec56dfdd90a62187c5862a551d070dca8d33b57e7975d1a0a0961dd142fbd" # fromImage: builder/scratch
-tools/less-less-668: "sha256:758ec56dfdd90a62187c5862a551d070dca8d33b57e7975d1a0a0961dd142fbd" # fromImage: builder/scratch
-tools/lvm2: "sha256:6b15b3d99da4cb3a42018f893cc735bb417b7baeb04e8e2ab701272fbdb91501" # fromImage: builder/scratch
-tools/lvm2-v2_03_31: "sha256:6b15b3d99da4cb3a42018f893cc735bb417b7baeb04e8e2ab701272fbdb91501" # fromImage: builder/scratch
-tools/sed: "sha256:6291dc716a9e4afb839613fae6721ab516ee89c542fb3b6f5cf2c72ce54a3279" # fromImage: builder/scratch
-tools/sed-v4.9: "sha256:6291dc716a9e4afb839613fae6721ab516ee89c542fb3b6f5cf2c72ce54a3279" # fromImage: builder/scratch
-tools/semver: "sha256:531b17771fcc608fbf05dbfb0b02e19d9ae6f4f31eb74595196dac11c665e85c" # fromImage: builder/scratch
-tools/semver-3.4.0: "sha256:531b17771fcc608fbf05dbfb0b02e19d9ae6f4f31eb74595196dac11c665e85c" # fromImage: builder/scratch
-tools/tini: "sha256:96b728363c3d1b8b575c967063defd963650b2a08ffdeab4743a59f3b5b74659" # fromImage: builder/scratch
-tools/tini-v0.19.0: "sha256:96b728363c3d1b8b575c967063defd963650b2a08ffdeab4743a59f3b5b74659" # fromImage: builder/scratch
-tools/util-linux: "sha256:3eeb40cde3284162470dded912239d7b72d36c9391a57b9b16576ed26bd9526e" # fromImage: builder/scratch
-tools/util-linux-v2.41: "sha256:3eeb40cde3284162470dded912239d7b72d36c9391a57b9b16576ed26bd9526e" # fromImage: builder/scratch
-tools/vim: "sha256:3f169d09782e8bfc2625b4e50b2c5d7154f9558f28d0dc1b87692cd17eee01a0" # fromImage: builder/scratch
-tools/vim-v9.1.1236: "sha256:3f169d09782e8bfc2625b4e50b2c5d7154f9558f28d0dc1b87692cd17eee01a0" # fromImage: builder/scratch
-tools/xfsprogs: "sha256:d92f3ffec66781382aabbb234ed9087b281d9aa4352c64460cb4140b279d13f3" # fromImage: builder/scratch
-tools/xfsprogs-v6.14.0: "sha256:d92f3ffec66781382aabbb234ed9087b281d9aa4352c64460cb4140b279d13f3" # fromImage: builder/scratch
-tools/yq: "sha256:a861d85aff5e78bf8fc763153af7c8405fabd11a5afe9bd644d3d99e3581f525" # fromImage: builder/scratch
-tools/yq-v4.45.1: "sha256:a861d85aff5e78bf8fc763153af7c8405fabd11a5afe9bd644d3d99e3581f525" # fromImage: builder/scratch
+base/distroless: "sha256:f3a572a4b43579eed3152da8bf62fe4646a49f7fdf7d9b435519ff084a830b72" # fromImage: builder/scratch
+base/nginx: "sha256:45f69580de8be873422201a7ff574308626dc33799b8cbac1e1b48e1cd6ef41a" # fromImage: builder/scratch
+base/nginx-release-1.28.0: "sha256:45f69580de8be873422201a7ff574308626dc33799b8cbac1e1b48e1cd6ef41a" # fromImage: builder/scratch
+base/python: "sha256:c452da34a62c9e0f72b6deaa34150844c26d54759c3425f607ab92fd64be213e" # fromImage: builder/scratch
+base/python-v3.12.10: "sha256:c452da34a62c9e0f72b6deaa34150844c26d54759c3425f607ab92fd64be213e" # fromImage: builder/scratch
+builder/alpine: "sha256:aecc3f2942cc2e2d0ae0648b76e943f0f1ece49a73bb41a49aaf4d08a54a757c" # from: alpine:3.21.3
+builder/alpine-3.20: "sha256:c57112bd2caafc3dab2b4839f2dee011f6993ffdbc30d148da3d21a5e1bfd2ec" # from: alpine:3.20.6
+builder/alpine-3.21: "sha256:aecc3f2942cc2e2d0ae0648b76e943f0f1ece49a73bb41a49aaf4d08a54a757c" # from: alpine:3.21.3
+builder/alt: "sha256:cd0065418afb6a65c7ccbde4f7bd8fde978a7fff96ade807aeab6628165e975c" # from: registry.altlinux.org/p11/alt:20250321
+builder/alt-2025-06-06: "sha256:cd0065418afb6a65c7ccbde4f7bd8fde978a7fff96ade807aeab6628165e975c" # from: registry.altlinux.org/p11/alt:20250321
+builder/alt-go-svace: "sha256:f6b1f4b86bd6997b0445aae2026f7e7394e889b0ee87cd9f6fa29b774699611c" # fromImage: builder/alt
+builder/alt-go-svace-2025-06-06: "sha256:f6b1f4b86bd6997b0445aae2026f7e7394e889b0ee87cd9f6fa29b774699611c" # fromImage: builder/alt
+builder/golang-alpine: "sha256:a91a2924db8483737a98380b3c7b91a664d9e2e8d5d97e19014c79e5152b8162" # from: golang:1.24.3-alpine3.20
+builder/golang-alpine-1.23: "sha256:59ebc79c0cd8143ff03896d175ca0993278a1e94128ec384cac75834b225a446" # from: golang:1.23.9-alpine3.20
+builder/golang-alpine-1.24: "sha256:a91a2924db8483737a98380b3c7b91a664d9e2e8d5d97e19014c79e5152b8162" # from: golang:1.24.3-alpine3.20
+builder/golang-bookworm: "sha256:9a5851fc7a871df4491982b4539aacccc4f2db630f6a8a1ed4ffc620c13cf315" # from: golang:1.24.3-bookworm
+builder/golang-bookworm-1.23: "sha256:81b19b1c3e28a029c2ec4d5166753ca9647cb12a794170ed16dbc2992f17fc4e" # from: golang:1.23.9-bookworm
+builder/golang-bookworm-1.24: "sha256:9a5851fc7a871df4491982b4539aacccc4f2db630f6a8a1ed4ffc620c13cf315" # from: golang:1.24.3-bookworm
+builder/golang-bullseye: "sha256:f019a6df57f2c9539c5f3b4ae64577f983e2f7516b7acd869dff86a7e9fc7643" # from: golang:1.24.3-bullseye
+builder/golang-bullseye-1.23: "sha256:ec09063bab15e7e1cbb294babab592e2752697d1e7e4181657002403670d01a7" # from: golang:1.23.9-bullseye
+builder/golang-bullseye-1.24: "sha256:f019a6df57f2c9539c5f3b4ae64577f983e2f7516b7acd869dff86a7e9fc7643" # from: golang:1.24.3-bullseye
+builder/node-alpine: "sha256:c7d2d5c84632c98e6dc54f658175f9c12395e2d022d2860472fd6518b6105b1f" # from: node:22.16.0-alpine3.20
+builder/node-alpine-22.16: "sha256:c7d2d5c84632c98e6dc54f658175f9c12395e2d022d2860472fd6518b6105b1f" # from: node:22.16.0-alpine3.20
+builder/node-alpine-23.10: "sha256:b656e5e29209ca0b556b97e442cd06f648d6efc8aec216873f7b62840beec281" # from: node:23.10.0-alpine3.20
+builder/scratch: "sha256:3541513fb5ec0ec1d7fa7e034a33a8180313da4ce8e83a7ced77c08e46a94425" # from: registry.werf.io/werf/scratch
+builder/src: "sha256:d32f2ae55ad39c25c725200b39923bd41f964eb9d6c1065388e9dd0abdecf035" # fromImage: builder/alt
+libs/bzip2: "sha256:b98f9d320febc003d98fff0712b4083c7aa8e7cfa9bfe2a67a64ad3630f6dcd6" # fromImage: builder/scratch
+libs/bzip2-bzip2-1.0.8: "sha256:b98f9d320febc003d98fff0712b4083c7aa8e7cfa9bfe2a67a64ad3630f6dcd6" # fromImage: builder/scratch
+libs/gdbm: "sha256:8be3205590c58686a27824a025814003115e4b27fba99a8a9ffe7637019e51e8" # fromImage: builder/scratch
+libs/gdbm-v1.24: "sha256:8be3205590c58686a27824a025814003115e4b27fba99a8a9ffe7637019e51e8" # fromImage: builder/scratch
+libs/glibc: "sha256:b44387b9a1cee0e010bc9beec3f9646ebcccab6da7603388cea9839e32251ad9" # fromImage: builder/scratch
+libs/glibc-v2.41: "sha256:b44387b9a1cee0e010bc9beec3f9646ebcccab6da7603388cea9839e32251ad9" # fromImage: builder/scratch
+libs/json-c: "sha256:458060f3573aebff74f3148d486c0e912c7e6494fbab313e2bc4e610411f8163" # fromImage: builder/scratch
+libs/json-c-json-c-0.18-20240915: "sha256:458060f3573aebff74f3148d486c0e912c7e6494fbab313e2bc4e610411f8163" # fromImage: builder/scratch
+libs/keyutils: "sha256:25790adaee709bf6311903b0bffd1fc445f9ff34fde45ef4a245499615141d9c" # fromImage: builder/scratch
+libs/keyutils-v1.6.1: "sha256:25790adaee709bf6311903b0bffd1fc445f9ff34fde45ef4a245499615141d9c" # fromImage: builder/scratch
+libs/krb5: "sha256:01ad1ab01b6aee8c06d30d25e9255bb88268cbba3bf1b94e6078aa39fff1037c" # fromImage: builder/scratch
+libs/krb5-krb5-1.21.3-final: "sha256:01ad1ab01b6aee8c06d30d25e9255bb88268cbba3bf1b94e6078aa39fff1037c" # fromImage: builder/scratch
+libs/libaio: "sha256:b73dc28383dc2e8ae17391c144c6254d763b53fbcce1154b2a4b040a39abfe87" # fromImage: builder/scratch
+libs/libaio-libaio-0.3.113: "sha256:b73dc28383dc2e8ae17391c144c6254d763b53fbcce1154b2a4b040a39abfe87" # fromImage: builder/scratch
+libs/libev: "sha256:2bc690555e64e048ab43ff22a5259f3d2b127f6bb187d84cc44a3f7c076d317e" # fromImage: builder/scratch
+libs/libev-v4.33: "sha256:2bc690555e64e048ab43ff22a5259f3d2b127f6bb187d84cc44a3f7c076d317e" # fromImage: builder/scratch
+libs/libevent: "sha256:628afa773a5f642df1aa61a8e96cec0991490c1aaa510c3a89d5d3644bfc059a" # fromImage: builder/scratch
+libs/libevent-release-2.2.1-alpha: "sha256:628afa773a5f642df1aa61a8e96cec0991490c1aaa510c3a89d5d3644bfc059a" # fromImage: builder/scratch
+libs/libffi: "sha256:4413b467e56a32f3bc610a49e7761a6c59ad86a973e4af6ed12dc5bfb2f24947" # fromImage: builder/scratch
+libs/libffi-v3.4.8: "sha256:4413b467e56a32f3bc610a49e7761a6c59ad86a973e4af6ed12dc5bfb2f24947" # fromImage: builder/scratch
+libs/libinih: "sha256:8b8f9244fe0c2c3cab9251ba2abd7f89080f9b9f8972e78643f3c4e8e0e40ab6" # fromImage: builder/scratch
+libs/libinih-r60: "sha256:8b8f9244fe0c2c3cab9251ba2abd7f89080f9b9f8972e78643f3c4e8e0e40ab6" # fromImage: builder/scratch
+libs/libnl: "sha256:e2c1187328cfaf508e2d5ee8eacbc454b0e5cda79a2fba482fe71e2924f3a476" # fromImage: builder/scratch
+libs/libnl-libnl3_2_25: "sha256:e2c1187328cfaf508e2d5ee8eacbc454b0e5cda79a2fba482fe71e2924f3a476" # fromImage: builder/scratch
+libs/libtirpc: "sha256:f35862575f13a747ef26c2aec7c7964023ae6509578a3f43dda9464892b4d2a1" # fromImage: builder/scratch
+libs/libtirpc-libtirpc-1-3-6: "sha256:f35862575f13a747ef26c2aec7c7964023ae6509578a3f43dda9464892b4d2a1" # fromImage: builder/scratch
+libs/libxml2: "sha256:cca058485cebd1de8740374cfacef0890c5fdd4f5d1bc3da939b8bd5d9f4d901" # fromImage: builder/scratch
+libs/libxml2-v2.14.3: "sha256:cca058485cebd1de8740374cfacef0890c5fdd4f5d1bc3da939b8bd5d9f4d901" # fromImage: builder/scratch
+libs/musl: "sha256:764a11ab750b8996e18f8c39876ef64c977eea1a96a87b7b9f0e6b0ab61ba83c" # fromImage: builder/scratch
+libs/musl-v1.2.5: "sha256:764a11ab750b8996e18f8c39876ef64c977eea1a96a87b7b9f0e6b0ab61ba83c" # fromImage: builder/scratch
+libs/ncurses: "sha256:9af826d4323efb575c957b03d9b531d396db3a64a95a6e85334d74f6d556be72" # fromImage: builder/scratch
+libs/ncurses-v6.5: "sha256:9af826d4323efb575c957b03d9b531d396db3a64a95a6e85334d74f6d556be72" # fromImage: builder/scratch
+libs/oniguruma: "sha256:1394de0f67d2d644503b32be8727c40b313c8c4a0a9055bfb069d1575fb4885e" # fromImage: builder/scratch
+libs/oniguruma-v6.9.10: "sha256:1394de0f67d2d644503b32be8727c40b313c8c4a0a9055bfb069d1575fb4885e" # fromImage: builder/scratch
+libs/pcre2: "sha256:a61004ae9608b07e4caa0ffd15bc38eaf17cd8de462e862229644e05f153907d" # fromImage: builder/scratch
+libs/pcre2-pcre2-10.45: "sha256:a61004ae9608b07e4caa0ffd15bc38eaf17cd8de462e862229644e05f153907d" # fromImage: builder/scratch
+libs/popt: "sha256:62f55caf21dbf8c3755b1a44339e9bafec665ea71b189c077aecdf4dee778474" # fromImage: builder/scratch
+libs/popt-popt-1.19-release: "sha256:62f55caf21dbf8c3755b1a44339e9bafec665ea71b189c077aecdf4dee778474" # fromImage: builder/scratch
+libs/readline: "sha256:62db43cba44205114507fafc399ae4af18c0eb3c11dc4eff0efd3e83d8ec59f2" # fromImage: builder/scratch
+libs/readline-readline-8.2: "sha256:62db43cba44205114507fafc399ae4af18c0eb3c11dc4eff0efd3e83d8ec59f2" # fromImage: builder/scratch
+libs/skalibs: "sha256:a9ca275332f19eb9bceb6aa8c30a3e01cca22d875958fcfb64d2791743c96108" # fromImage: builder/scratch
+libs/skalibs-v2.14.3.0: "sha256:a9ca275332f19eb9bceb6aa8c30a3e01cca22d875958fcfb64d2791743c96108" # fromImage: builder/scratch
+libs/sqlite: "sha256:cde3d0e37d0d242eb81c72bac089b248b4b4d6334abb50ede7655f878999205c" # fromImage: builder/scratch
+libs/sqlite-version-3.49.1: "sha256:cde3d0e37d0d242eb81c72bac089b248b4b4d6334abb50ede7655f878999205c" # fromImage: builder/scratch
+libs/userspace-rcu: "sha256:bbc87ade43951386aa409b550bc1e8179fd72a560c48cd19b8b3b6317d9ee4d5" # fromImage: builder/scratch
+libs/userspace-rcu-v0.15.2: "sha256:bbc87ade43951386aa409b550bc1e8179fd72a560c48cd19b8b3b6317d9ee4d5" # fromImage: builder/scratch
+libs/utmps: "sha256:e5c089fb6b51cb036b9c6e37d9e7224764eda00a9c335db5ff4387901effb85b" # fromImage: builder/scratch
+libs/utmps-v0.1.2.3: "sha256:e5c089fb6b51cb036b9c6e37d9e7224764eda00a9c335db5ff4387901effb85b" # fromImage: builder/scratch
+libs/xz: "sha256:507c6c16ee547cb4892db6d2ba20a5b53fbfeb9acbf95845d3a2fca6d3dfd70a" # fromImage: builder/scratch
+libs/xz-v5.8.1: "sha256:507c6c16ee547cb4892db6d2ba20a5b53fbfeb9acbf95845d3a2fca6d3dfd70a" # fromImage: builder/scratch
+libs/zlib: "sha256:a463bc6c82e5a9e9fd5db402510ae591561e1b966f9623fa2e6d377919d3087b" # fromImage: builder/scratch
+libs/zlib-v1.3.1: "sha256:a463bc6c82e5a9e9fd5db402510ae591561e1b966f9623fa2e6d377919d3087b" # fromImage: builder/scratch
+tools/bash: "sha256:f2d9e9b89e6bd0f8be8a4cb2bfadd3769c4ac9d2d7f22ab7f796af089df93946" # fromImage: builder/scratch
+tools/bash-v5.2.37: "sha256:f2d9e9b89e6bd0f8be8a4cb2bfadd3769c4ac9d2d7f22ab7f796af089df93946" # fromImage: builder/scratch
+tools/coreutils: "sha256:dc304b2b99f5197b40ab5204c87e9ef20fd17223e4f4c774b23e1e9180b14d69" # fromImage: builder/scratch
+tools/coreutils-v9.7: "sha256:dc304b2b99f5197b40ab5204c87e9ef20fd17223e4f4c774b23e1e9180b14d69" # fromImage: builder/scratch
+tools/cosign: "sha256:764beea2f92fc6a1ad53d4c82c5b57a67a4bb0941cf3cc57f0667b51f098454a" # fromImage: builder/scratch
+tools/cosign-v2.4.3: "sha256:764beea2f92fc6a1ad53d4c82c5b57a67a4bb0941cf3cc57f0667b51f098454a" # fromImage: builder/scratch
+tools/cryptsetup: "sha256:4e63a30db6f0e9d5a65d31d7ef53f824818bebf8b564d1f5805c714420649dba" # fromImage: builder/scratch
+tools/cryptsetup-v2.7.5: "sha256:4e63a30db6f0e9d5a65d31d7ef53f824818bebf8b564d1f5805c714420649dba" # fromImage: builder/scratch
+tools/e2fsprogs: "sha256:f5a5fcd1bb0a84f39044c2f746ebe006f49632b1deb03cc73ac535b383af304b" # fromImage: builder/scratch
+tools/e2fsprogs-v1.47.2: "sha256:f5a5fcd1bb0a84f39044c2f746ebe006f49632b1deb03cc73ac535b383af304b" # fromImage: builder/scratch
+tools/erofs-utils: "sha256:3740a2cc02fa64b7f6bbb1645d89fff0aca6e0b3974d3c939f8e85096d82939f" # fromImage: builder/scratch
+tools/erofs-utils-v1.8.5: "sha256:3740a2cc02fa64b7f6bbb1645d89fff0aca6e0b3974d3c939f8e85096d82939f" # fromImage: builder/scratch
+tools/findutils: "sha256:d00710e10d63c5d41e83c0cb5a06032c72454b17cf54bcea5220cfc5c7636fb6" # fromImage: builder/scratch
+tools/findutils-v4.10.0: "sha256:d00710e10d63c5d41e83c0cb5a06032c72454b17cf54bcea5220cfc5c7636fb6" # fromImage: builder/scratch
+tools/gawk: "sha256:96d1818480eca4f3924ff81fbe681de6457658f2731e6cca88f7d55b5c96d8d4" # fromImage: builder/scratch
+tools/gawk-v5.3.2: "sha256:96d1818480eca4f3924ff81fbe681de6457658f2731e6cca88f7d55b5c96d8d4" # fromImage: builder/scratch
+tools/grep: "sha256:c47e83973fe2260489b851116ed806f114dd0b918a08299aa36a54f2e8eb6319" # fromImage: builder/scratch
+tools/grep-grep-3.11: "sha256:c47e83973fe2260489b851116ed806f114dd0b918a08299aa36a54f2e8eb6319" # fromImage: builder/scratch
+tools/jq: "sha256:8cff7732bb5a173b89cdadad1d0d923dfa4c6c47bab933db93abe7ea150484af" # fromImage: builder/scratch
+tools/jq-jq-1.7.1: "sha256:8cff7732bb5a173b89cdadad1d0d923dfa4c6c47bab933db93abe7ea150484af" # fromImage: builder/scratch
+tools/less: "sha256:86fdc739fdd476693de3b91f789c13ca3dc5690cf92858e4f4d4b2afd43326dc" # fromImage: builder/scratch
+tools/less-less-668: "sha256:86fdc739fdd476693de3b91f789c13ca3dc5690cf92858e4f4d4b2afd43326dc" # fromImage: builder/scratch
+tools/libcap: "sha256:1031f1267a81a6644f7395ca87bb53283a5f70cfa709ee9043706aefc489a945" # fromImage: builder/scratch
+tools/libcap-v1.2.76: "sha256:1031f1267a81a6644f7395ca87bb53283a5f70cfa709ee9043706aefc489a945" # fromImage: builder/scratch
+tools/lvm2: "sha256:7ce91b1fafbac6390372beefac9152d50f9904d524ed8f90e36d31bfbcc8fc5b" # fromImage: builder/scratch
+tools/lvm2-v2_03_31: "sha256:7ce91b1fafbac6390372beefac9152d50f9904d524ed8f90e36d31bfbcc8fc5b" # fromImage: builder/scratch
+tools/nfs-utils: "sha256:f86c11311bd1852a03bde7132eaa54596edb9cfa276cc2098eb40fa9d1dcb147" # fromImage: builder/scratch
+tools/nfs-utils-nfs-utils-2-8-2: "sha256:f86c11311bd1852a03bde7132eaa54596edb9cfa276cc2098eb40fa9d1dcb147" # fromImage: builder/scratch
+tools/openssl: "sha256:49b4d4134046e66057d8aee8070cb53608bb0ce09ddd065dea0c618dfbf583c2" # fromImage: builder/scratch
+tools/openssl-openssl-3.5.0: "sha256:49b4d4134046e66057d8aee8070cb53608bb0ce09ddd065dea0c618dfbf583c2" # fromImage: builder/scratch
+tools/sed: "sha256:634e5ba9fb711a2ee89e8502a8260f6a76515525bcccd102ee7b145aa7e03a9a" # fromImage: builder/scratch
+tools/sed-v4.9: "sha256:634e5ba9fb711a2ee89e8502a8260f6a76515525bcccd102ee7b145aa7e03a9a" # fromImage: builder/scratch
+tools/semver: "sha256:2f6f36dc40ad42e1a3cef0aafcc8dd9a16cb4bb0fd719818101cbd99b3a46c11" # fromImage: builder/scratch
+tools/semver-3.4.0: "sha256:2f6f36dc40ad42e1a3cef0aafcc8dd9a16cb4bb0fd719818101cbd99b3a46c11" # fromImage: builder/scratch
+tools/tar: "sha256:a62696301e80d01013eb6150e8529eca8608975a1c6b759ea9e17008df6e443b" # fromImage: builder/scratch
+tools/tar-v1.35: "sha256:a62696301e80d01013eb6150e8529eca8608975a1c6b759ea9e17008df6e443b" # fromImage: builder/scratch
+tools/tini: "sha256:6b35151c36f8f8b5acec13730d5c587059037038912a7e47ff0728ec018b0fe5" # fromImage: builder/scratch
+tools/tini-v0.19.0: "sha256:6b35151c36f8f8b5acec13730d5c587059037038912a7e47ff0728ec018b0fe5" # fromImage: builder/scratch
+tools/util-linux: "sha256:8890ee465bb70ac1a59c330819b5d3e32d63870dd7055b61bca756c636269ea8" # fromImage: builder/scratch
+tools/util-linux-v2.41: "sha256:8890ee465bb70ac1a59c330819b5d3e32d63870dd7055b61bca756c636269ea8" # fromImage: builder/scratch
+tools/vim: "sha256:992b976b4e5f25fe458cb86d42f3f8b864683ac92e3154c3d0526bcfd7acc429" # fromImage: builder/scratch
+tools/vim-v9.1.1236: "sha256:992b976b4e5f25fe458cb86d42f3f8b864683ac92e3154c3d0526bcfd7acc429" # fromImage: builder/scratch
+tools/xfsprogs: "sha256:d210128b00ee43b75a8a0d7e0b4a805a8aaa109210b88240e2851877bcb6f448" # fromImage: builder/scratch
+tools/xfsprogs-v6.14.0: "sha256:d210128b00ee43b75a8a0d7e0b4a805a8aaa109210b88240e2851877bcb6f448" # fromImage: builder/scratch
+tools/yq: "sha256:adb6d7800d8e092e4175f85086f047ed74071227a27643ebbac261149bab856c" # fromImage: builder/scratch
+tools/yq-v4.45.1: "sha256:adb6d7800d8e092e4175f85086f047ed74071227a27643ebbac261149bab856c" # fromImage: builder/scratch
diff --git a/images/dvcr-artifact/werf.inc.yaml b/images/dvcr-artifact/werf.inc.yaml
index c1b6f8a29a..a396c212a2 100644
--- a/images/dvcr-artifact/werf.inc.yaml
+++ b/images/dvcr-artifact/werf.inc.yaml
@@ -1,7 +1,7 @@
 ---
 image: {{ $.ImageName }}-builder
 final: false
-fromImage: builder/golang-bookworm-1.23{{ $.SVACE_IMAGE_SUFFIX }}
+fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.23" "builder/alt-go-svace" }}
 git:
 - add: /images/{{ $.ImageName }}
   to: /src
@@ -13,9 +13,15 @@ git:
     - "**/*.go"
 shell:
   install:
+{{- if eq $.SVACE_ENABLED "false" }}
   {{- include "debian packages proxy" . | nindent 2 }}
   - apt-get -qq install -y --no-install-recommends libnbd-dev
   {{- include "debian packages clean" . | nindent 2 }}
+{{- else }}
+  {{- include "alt packages proxy" . | nindent 2 }}
+  - apt-get -qq install -y libnbd-devel
+  {{- include "alt packages clean" . | nindent 2 }}
+{{- end }}
   setup:
   - mkdir /out
   - cd /src
diff --git a/images/dvcr/werf.inc.yaml b/images/dvcr/werf.inc.yaml
index 36aaeb110f..d9d016a766 100644
--- a/images/dvcr/werf.inc.yaml
+++ b/images/dvcr/werf.inc.yaml
@@ -22,7 +22,7 @@ imageSpec:
 
 image: {{ $.ImageName }}-builder
 final: false
-fromImage: builder/golang-bookworm-1.23{{ $.SVACE_IMAGE_SUFFIX }}
+fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.23" "builder/alt-go-svace" }}
 mount:
   - fromPath: ~/go-pkg-cache
     to: /go/pkg
diff --git a/images/libvirt/werf.inc.yaml b/images/libvirt/werf.inc.yaml
index 6fb3e40ea9..f38a35e204 100644
--- a/images/libvirt/werf.inc.yaml
+++ b/images/libvirt/werf.inc.yaml
@@ -5,7 +5,7 @@
 
 image: {{ $.ImageName }}
 final: false
-fromImage: base-alt-p11{{ $.SVACE_IMAGE_SUFFIX }}
+fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "base-alt-p11" "builder/alt-go-svace" }}
 git:
 - add: /images/{{ $.ImageName }}/
   to: /
diff --git a/images/qemu/werf.inc.yaml b/images/qemu/werf.inc.yaml
index 50e972f953..e5d35ba2a9 100644
--- a/images/qemu/werf.inc.yaml
+++ b/images/qemu/werf.inc.yaml
@@ -79,7 +79,7 @@ libraries:
 
 image: {{ $.ImageName }}
 final: false
-fromImage: base-alt-p11{{ $.SVACE_IMAGE_SUFFIX }}
+fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "base-alt-p11" "builder/alt-go-svace" }}
 git:
 - add: /images/{{ $.ImageName }}/
   to: /
diff --git a/images/svace-builder/werf.inc.yaml b/images/svace-builder/werf.inc.yaml
deleted file mode 100644
index 103cc9016e..0000000000
--- a/images/svace-builder/werf.inc.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-image: {{ $.ImageName }}-download
-final: false
-fromImage: builder/alpine
-secrets:
-- id: SOURCE_REPO
-  value: {{ $.SOURCE_REPO_GIT }}
-shell:
-  beforeInstall:
-  - apk update
-  - apk add wget
-  - apk add git openssh-client
-  - mkdir ~/.ssh/
-  - echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
-  install:
-  - git clone --depth 1 --branch v4.0.250415 $(cat /run/secrets/SOURCE_REPO)/ispras/svace.git /opt/svace
-
----
-image: base-alt-p11/svace
-final: false
-fromImage: BASE_ALT_P11
-import:
-- image: {{ $.ImageName }}-download
-  add: /opt/svace
-  to: /opt/svace
-  before: install
-shell:
-  beforeInstall:
-  {{- include "alt packages proxy" . | nindent 2 }}
-  - |
-    apt-get install -y \
-      wget rsync bzip2 golang git binutils make gcc \
-      glibc-pthread glibc-devel glibc-devel-static
-    echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
-  install:
-  - |
-    ln -s /opt/svace/bin/svace /usr/local/bin/svace
----
-image: builder/golang-bookworm-1.23/svace
-final: false
-fromImage: builder/golang-bookworm-1.23
-import:
-- image: {{ $.ImageName }}-download
-  add: /opt/svace
-  to: /opt/svace
-  before: install
-shell:
-  beforeInstall:
-  {{- include "debian packages proxy" . | nindent 2 }}
-  - |
-    apt-get install -y \
-      bzip2 rsync
-    mkdir -p /root/.ssh
-    echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
-  install:
-  - |
-    ln -s /opt/svace/bin/svace /usr/local/bin/svace
diff --git a/images/virt-artifact/werf.inc.yaml b/images/virt-artifact/werf.inc.yaml
index 60ad5a3a93..d01b5bde3c 100644
--- a/images/virt-artifact/werf.inc.yaml
+++ b/images/virt-artifact/werf.inc.yaml
@@ -27,7 +27,7 @@ packages:
 
 image: {{ $.ImageName }}
 final: false
-fromImage: base-alt-p11{{ $.SVACE_IMAGE_SUFFIX }}
+fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "base-alt-p11" "builder/alt-go-svace" }}
 mount:
   - fromPath: ~/go-pkg-cache
     to: /go/pkg
diff --git a/images/virtualization-artifact/werf.inc.yaml b/images/virtualization-artifact/werf.inc.yaml
index e6bf5be0b1..eceb2a5452 100644
--- a/images/virtualization-artifact/werf.inc.yaml
+++ b/images/virtualization-artifact/werf.inc.yaml
@@ -1,7 +1,7 @@
 ---
 image: {{ $.ImageName }}
 final: false
-fromImage: builder/golang-bookworm-1.23{{ $.SVACE_IMAGE_SUFFIX }}
+fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.23" "builder/alt-go-svace" }}
 git:
 - add: /api
   to: /usr/local/go/api
diff --git a/images/vm-route-forge/werf.inc.yaml b/images/vm-route-forge/werf.inc.yaml
index 94069448f0..ec096af10e 100644
--- a/images/vm-route-forge/werf.inc.yaml
+++ b/images/vm-route-forge/werf.inc.yaml
@@ -1,7 +1,7 @@
 ---
 image: {{ $.ImageName }}-builder
 final: false
-fromImage: builder/golang-bookworm-1.23{{ $.SVACE_IMAGE_SUFFIX }}
+fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.23" "builder/alt-go-svace" }}
 git:
 - add: /images/{{ $.ImageName }}
   to: /app/images/vm-route-forge
diff --git a/werf.yaml b/werf.yaml
index 29b1671442..9a306420a2 100644
--- a/werf.yaml
+++ b/werf.yaml
@@ -32,9 +32,6 @@ build:
 # svace analyze toggler
 {{- $_ := set . "SVACE_ENABLED" (env "SVACE_ENABLED" "false") }}
 
-{{- $_ := set . "SVACE_IMAGE_SUFFIX" "" }}
-{{- if ne .SVACE_ENABLED "false" }}{{ $_ := set . "SVACE_IMAGE_SUFFIX" "/svace" }}{{ end }}
-
 {{- $_ := set . "SVACE_ANALYZE_HOST" (env "SVACE_ANALYZE_HOST" "example.host") }}
 
 {{- $_ := set . "SVACE_ANALYZE_SSH_USER" (env "SVACE_ANALYZE_SSH_USER" "user") }}