diff --git a/.github/workflows/nightly_e2e_tests_report.yaml b/.github/workflows/nightly_e2e_tests_report.yaml
index c56a70d3c9..baebc437dd 100644
--- a/.github/workflows/nightly_e2e_tests_report.yaml
+++ b/.github/workflows/nightly_e2e_tests_report.yaml
@@ -45,7 +45,7 @@ jobs:
           markdown_table=""
 
           header="| CSI | Status | Passed | Failed	| Pending	| Skipped	| Date | Time | Branch|\n"
-          separator="|---|---|---|---|---|---|---|---|\n"
+          separator="|---|---|---|---|---|---|---|---|---|\n"
 
           markdown_table+="$header"
           markdown_table+="$separator"
diff --git a/api/core/v1alpha2/virtual_machine_operation.go b/api/core/v1alpha2/virtual_machine_operation.go
index 0b6e0ebfac..40a585ba05 100644
--- a/api/core/v1alpha2/virtual_machine_operation.go
+++ b/api/core/v1alpha2/virtual_machine_operation.go
@@ -69,22 +69,26 @@ type VirtualMachineOperationRestoreSpec struct {
 	VirtualMachineSnapshotName string `json:"virtualMachineSnapshotName"`
 }
 
+// +kubebuilder:validation:XValidation:rule="(has(self.customization) && ((has(self.customization.namePrefix) && size(self.customization.namePrefix) > 0) || (has(self.customization.nameSuffix) && size(self.customization.nameSuffix) > 0))) || (has(self.nameReplacement) && size(self.nameReplacement) > 0)",message="At least one of customization.namePrefix, customization.nameSuffix, or nameReplacement must be set"
 // VirtualMachineOperationCloneSpec defines the clone operation.
 type VirtualMachineOperationCloneSpec struct {
 	Mode VMOPRestoreMode `json:"mode"`
 	// NameReplacement defines rules for renaming resources during cloning.
+	// +kubebuilder:validation:XValidation:rule="self.all(nr, has(nr.to) && size(nr.to) >= 1 && size(nr.to) <= 59)",message="Each nameReplacement.to must be between 1 and 59 characters"
 	NameReplacement []NameReplacement `json:"nameReplacement,omitempty"`
 	// Customization defines customization options for cloning.
 	Customization *VirtualMachineOperationCloneCustomization `json:"customization,omitempty"`
 }
 
+// +kubebuilder:validation:XValidation:rule="!has(self.namePrefix) || (size(self.namePrefix) >= 1 && size(self.namePrefix) <= 59)",message="namePrefix length must be between 1 and 59 characters if set"
+// +kubebuilder:validation:XValidation:rule="!has(self.nameSuffix) || (size(self.nameSuffix) >= 1 && size(self.nameSuffix) <= 59)",message="nameSuffix length must be between 1 and 59 characters if set"
 // VirtualMachineOperationCloneCustomization defines customization options for cloning.
 type VirtualMachineOperationCloneCustomization struct {
 	// NamePrefix adds a prefix to resource names during cloning.
-	// Applied to VirtualDisk, VirtualMachineIPAddress, VirtualMachineMACAddress, and Secret resources.
+	// Applied to VirtualMachine, VirtualDisk, VirtualMachineBlockDeviceAttachment, and Secret resources.
 	NamePrefix string `json:"namePrefix,omitempty"`
 	// NameSuffix adds a suffix to resource names during cloning.
-	// Applied to VirtualDisk, VirtualMachineIPAddress, VirtualMachineMACAddress, and Secret resources.
+	// Applied to VirtualMachine, VirtualDisk, VirtualMachineBlockDeviceAttachment, and Secret resources.
 	NameSuffix string `json:"nameSuffix,omitempty"`
 }
 
diff --git a/build/components/versions.yml b/build/components/versions.yml
index 89a1b119d5..7e93569e86 100644
--- a/build/components/versions.yml
+++ b/build/components/versions.yml
@@ -4,7 +4,7 @@ firmware:
   edk2: stable202411
 core:
   3p-kubevirt: v1.3.1-v12n.17
-  3p-containerized-data-importer: v1.60.3-v12n.11
+  3p-containerized-data-importer: v1.60.3-v12n.12
   distribution: 2.8.3
 package:
   acl: v2.3.1
@@ -13,7 +13,7 @@ package:
   dtc: v1.7.2
   e2fsprogs: v1.47.1
   file: FILE5_45
-  gcc: releases/gcc-14.2.0
+  gcc: releases/gcc-13.2.0
   glib2: 2.84.2
   glibc: glibc-2.38
   libgmp: 6.3.0
@@ -84,8 +84,9 @@ package:
   readline: readline-8.2
   cyrus-sasl2: cyrus-sasl-2.1.28 # libsasl2-3
   libseccomp: v2.6.0
-  selinux: 3.6
+  selinux: 3.8
   libslirp: v4.8.0
+  libxkbcommon: xkbcommon-1.10.0
   snappy: 1.2.2 # libsnappy
   systemd: v255
   zlib: v1.3.1
diff --git a/crds/virtualmachineoperations.yaml b/crds/virtualmachineoperations.yaml
index f941b062f3..c96023b308 100644
--- a/crds/virtualmachineoperations.yaml
+++ b/crds/virtualmachineoperations.yaml
@@ -81,6 +81,19 @@ spec:
                             Applied to VirtualMachine, VirtualDisk, VirtualMachineBlockDeviceAttachment, and Secret resources.
                           type: string
                       type: object
+                      x-kubernetes-validations:
+                        - message:
+                            namePrefix length must be between 1 and 59 characters
+                            if set
+                          rule:
+                            "!has(self.namePrefix) || (size(self.namePrefix) >= 1
+                            && size(self.namePrefix) <= 59)"
+                        - message:
+                            nameSuffix length must be between 1 and 59 characters
+                            if set
+                          rule:
+                            "!has(self.nameSuffix) || (size(self.nameSuffix) >= 1
+                            && size(self.nameSuffix) <= 59)"
                     mode:
                       description: |-
                         VMOPRestoreMode defines the kind of the restore operation.
@@ -121,9 +134,23 @@ spec:
                           - to
                         type: object
                       type: array
+                      x-kubernetes-validations:
+                        - message: Each nameReplacement.to must be between 1 and 59 characters
+                          rule:
+                            self.all(nr, has(nr.to) && size(nr.to) >= 1 && size(nr.to)
+                            <= 59)
                   required:
                     - mode
                   type: object
+                  x-kubernetes-validations:
+                    - message:
+                        At least one of customization.namePrefix, customization.nameSuffix,
+                        or nameReplacement must be set
+                      rule:
+                        (has(self.customization) && ((has(self.customization.namePrefix)
+                        && size(self.customization.namePrefix) > 0) || (has(self.customization.nameSuffix)
+                        && size(self.customization.nameSuffix) > 0))) || (has(self.nameReplacement)
+                        && size(self.nameReplacement) > 0)
                 force:
                   description: |-
                     Force execution of an operation.
diff --git a/docs/USER_GUIDE.md b/docs/USER_GUIDE.md
index 7c9e889fb8..606c2c531a 100644
--- a/docs/USER_GUIDE.md
+++ b/docs/USER_GUIDE.md
@@ -2492,26 +2492,12 @@ spec:
       name: user-net # Network name
 ```
 
-It is allowed to connect a VM to the same network multiple times. Example:
-
-```yaml
-spec:
-  networks:
-    - type: Main # Must always be specified first
-    - type: Network
-      name: user-net # Network name
-    - type: Network
-      name: user-net # Network name
-```
-
 Example of connecting to the cluster network `corp-net`:
 
 ```yaml
 spec:
   networks:
     - type: Main # Must always be specified first
-    - type: Network
-      name: user-net
     - type: Network
       name: user-net
     - type: ClusterNetwork
@@ -2527,12 +2513,9 @@ status:
     - type: Network
       name: user-net
       macAddress: aa:bb:cc:dd:ee:01
-    - type: Network
-      name: user-net
-      macAddress: aa:bb:cc:dd:ee:02
     - type: ClusterNetwork
       name: corp-net
-      macAddress: aa:bb:cc:dd:ee:03
+      macAddress: aa:bb:cc:dd:ee:02
 ```
 
 For each additional network interface, a unique MAC address is automatically generated and reserved to avoid collisions. The following resources are used for this: `VirtualMachineMACAddress` (`vmmac`) and `VirtualMachineMACAddressLease` (`vmmacl`).
diff --git a/docs/USER_GUIDE.ru.md b/docs/USER_GUIDE.ru.md
index 51b3ed90a8..b0d086c0c6 100644
--- a/docs/USER_GUIDE.ru.md
+++ b/docs/USER_GUIDE.ru.md
@@ -2524,26 +2524,12 @@ spec:
       name: user-net # Название сети
 ```
 
-Допускается подключать одну ВМ к одной и той же сети несколько раз. Пример:
-
-```yaml
-spec:
-  networks:
-    - type: Main # Обязательно указывать первым
-    - type: Network
-      name: user-net # Название сети
-    - type: Network
-      name: user-net # Название сети
-```
-
 Пример подключения кластерной сети `corp-net`:
 
 ```yaml
 spec:
   networks:
     - type: Main # Обязательно указывать первым
-    - type: Network
-      name: user-net
     - type: Network
       name: user-net
     - type: ClusterNetwork
@@ -2559,12 +2545,9 @@ status:
     - type: Network
       name: user-net
       macAddress: aa:bb:cc:dd:ee:01
-    - type: Network
-      name: user-net
-      macAddress: aa:bb:cc:dd:ee:02
     - type: ClusterNetwork
       name: corp-net
-      macAddress: aa:bb:cc:dd:ee:03
+      macAddress: aa:bb:cc:dd:ee:02
 ```
 
 Для каждого дополнительного сетевого интерфейса автоматически создается и резервируется уникальный MAC-адрес, что обеспечивает отсутствие коллизий MAC-адресов. Для этих целей используются ресурсы: `VirtualMachineMACAddress` (`vmmac`) и `VirtualMachineMACAddressLease` (`vmmacl`).
diff --git a/images/bounder/werf.inc.yaml b/images/bounder/werf.inc.yaml
index c8754aa397..312b449717 100644
--- a/images/bounder/werf.inc.yaml
+++ b/images/bounder/werf.inc.yaml
@@ -12,7 +12,7 @@ imageSpec:
 ---
 image: {{ .ModuleNamePrefix }}{{ .ImageName }}-cbuilder
 final: false
-fromImage: builder/golang-bookworm-1.23
+fromImage: builder/golang-bookworm-1.24
 git:
   - add: {{ .ModuleDir }}/images/{{ .ImageName }}/static_binaries
     to: /static_binaries
diff --git a/images/cdi-artifact/werf.inc.yaml b/images/cdi-artifact/werf.inc.yaml
index 28dbe2e068..bf2f44d8a7 100644
--- a/images/cdi-artifact/werf.inc.yaml
+++ b/images/cdi-artifact/werf.inc.yaml
@@ -143,7 +143,7 @@ shell:
 ---
 image: {{ .ModuleNamePrefix }}{{ .ImageName }}-cbuilder
 final: false
-fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.23" "builder/alt-go-svace" }}
+fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.24" "builder/alt-go-svace" }}
 git:
   - add: {{ .ModuleDir }}/images/{{ .ImageName }}
     to: /
diff --git a/images/cdi-cloner/werf.inc.yaml b/images/cdi-cloner/werf.inc.yaml
index f08ea278ed..ff238813b9 100644
--- a/images/cdi-cloner/werf.inc.yaml
+++ b/images/cdi-cloner/werf.inc.yaml
@@ -53,7 +53,7 @@ shell:
 ---
 image: {{ .ModuleNamePrefix }}{{ .ImageName }}-gobuild
 final: false
-fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.23" "builder/alt-go-svace" }}
+fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.24" "builder/alt-go-svace" }}
 git:
   - add: {{ .ModuleDir }}/images/{{ .ImageName }}/cloner-startup
     to: /app
diff --git a/images/dvcr-artifact/docker-fuzz.sh b/images/dvcr-artifact/docker-fuzz.sh
index b0378b4e44..4faa7ab9e9 100755
--- a/images/dvcr-artifact/docker-fuzz.sh
+++ b/images/dvcr-artifact/docker-fuzz.sh
@@ -62,6 +62,8 @@ echo
 
 docker run --rm \
     --platform linux/amd64 \
+    -v $(pwd)/fuzzartifact/.cache/go-build:/root/.cache/go-build \
+    -v $(pwd)/fuzzartifact/logs:/tmp/fuzz \
     $(docker build --platform linux/amd64 -q -f "$DOCKERFILE" .)
 
 echo
diff --git a/images/dvcr-artifact/fuzz.Dockerfile b/images/dvcr-artifact/fuzz.Dockerfile
index d1e168293f..a0a24af452 100644
--- a/images/dvcr-artifact/fuzz.Dockerfile
+++ b/images/dvcr-artifact/fuzz.Dockerfile
@@ -1,8 +1,9 @@
-FROM golang:1.23-bookworm
+FROM golang:1.24-bookworm
 
 RUN apt update -y && apt install -y \
   build-essential \
-  libnbd-dev
+  libnbd-dev \
+  qemu-utils
 
 WORKDIR /app
 
diff --git a/images/dvcr-artifact/fuzz.sh b/images/dvcr-artifact/fuzz.sh
index 50656a3e1b..db90a9315c 100755
--- a/images/dvcr-artifact/fuzz.sh
+++ b/images/dvcr-artifact/fuzz.sh
@@ -32,10 +32,10 @@ cleanup() {
   done
 
   # kill workers if they are still running
-  pids=$(ps aux | grep 'fuzzworker' | awk '{print $2}')
+  pids=$(pgrep -f fuzzworker)
   if [[ ! -z "$pids" ]]; then
-    echo "$pids" | xargs kill 2>/dev/null || true
-    sleep 1  # wait a moment for them to terminate
+    echo "$pids" | xargs kill -2 2>/dev/null || true
+    sleep 10  # wait a moment for them to terminate
     echo "$pids" | xargs kill -9 2>/dev/null || true
   fi
 
@@ -85,10 +85,10 @@ for file in ${files}; do
         wait "$fuzz_pid" 2>/dev/null || true
 
         # kill workers if they are still running
-        pids=$(ps aux | grep 'fuzzworker' | awk '{print $2}')
+        pids=$(pgrep -f fuzzworker)
         if [[ ! -z "$pids" ]]; then
-          echo "$pids" | xargs kill 2>/dev/null || true
-          sleep 1  # wait a moment for them to terminate
+          echo "$pids" | xargs kill -2 2>/dev/null || true
+          sleep 10  # wait a moment for them to terminate
           echo "$pids" | xargs kill -9 2>/dev/null || true
         fi
 
diff --git a/images/dvcr-artifact/pkg/fuzz/http.go b/images/dvcr-artifact/pkg/fuzz/http.go
index 3cfed46a04..470b690fe7 100644
--- a/images/dvcr-artifact/pkg/fuzz/http.go
+++ b/images/dvcr-artifact/pkg/fuzz/http.go
@@ -20,7 +20,6 @@ import (
 	"bytes"
 	"fmt"
 	"net/http"
-	"os"
 	"regexp"
 	"strconv"
 	"strings"
@@ -31,19 +30,19 @@ import (
 	"github.com/hashicorp/go-cleanhttp"
 )
 
-func ProcessRequests(t *testing.T, data []byte, addr string, methods ...string) {
-	t.Helper()
+func ProcessRequests(tb *testing.T, data []byte, addr string, methods ...string) {
+	tb.Helper()
 
 	if len(methods) == 0 {
-		t.Fatalf("no methods specified")
+		tb.Fatalf("no methods specified")
 	}
 	for _, method := range methods {
-		ProcessRequest(t, data, addr, method)
+		ProcessRequest(tb, data, addr, method)
 	}
 }
 
-func ProcessRequest(t testing.TB, data []byte, addr, method string) {
-	t.Helper()
+func ProcessRequest(tb testing.TB, data []byte, addr, method string) {
+	tb.Helper()
 
 	switch method {
 	case
@@ -57,26 +56,26 @@ func ProcessRequest(t testing.TB, data []byte, addr, method string) {
 		http.MethodOptions,
 		http.MethodTrace:
 
-		req := newFuzzRequest().Fuzz(t, data, method, addr)
+		req := newFuzzRequest().Fuzz(tb, data, method, addr)
 		defer req.Body.Close()
 
-		resp := fuzzHTTPRequest(t, req)
+		resp := fuzzHTTPRequest(tb, req)
 		if resp != nil {
 			if resp.StatusCode > 500 {
-				t.Errorf("resp: %v", resp)
+				tb.Errorf("resp: %v", resp)
 			}
 			defer resp.Body.Close()
 		}
 	default:
-		t.Errorf("Unsupported HTTP method: %s", method)
+		tb.Errorf("Unsupported HTTP method: %s", method)
 	}
 }
 
-func fuzzHTTPRequest(t testing.TB, fuzzReq *http.Request) *http.Response {
-	t.Helper()
+func fuzzHTTPRequest(tb testing.TB, fuzzReq *http.Request) *http.Response {
+	tb.Helper()
 
 	if fuzzReq == nil {
-		t.Skip("Skipping test because fuzzReq is nil")
+		tb.Skip("Skipping test because fuzzReq is nil")
 	}
 	client := cleanhttp.DefaultClient()
 	client.Timeout = time.Second
@@ -98,11 +97,11 @@ func fuzzHTTPRequest(t testing.TB, fuzzReq *http.Request) *http.Response {
 		return nil
 	}
 
-	t.Logf("fuzzing request, %s, %s", fuzzReq.Method, fuzzReq.URL)
+	tb.Logf("fuzzing request, %s, %s", fuzzReq.Method, fuzzReq.URL)
 
 	resp, err := client.Do(fuzzReq)
 	if err != nil && !strings.Contains(err.Error(), "checkRedirect disabled for test") {
-		t.Logf("err: %s", err)
+		tb.Logf("err: %s", err)
 	}
 
 	return resp
@@ -114,14 +113,14 @@ func newFuzzRequest() *fuzzRequest {
 	return &fuzzRequest{}
 }
 
-func (s *fuzzRequest) Fuzz(t testing.TB, data []byte, method, addr string) *http.Request {
-	t.Helper()
+func (s *fuzzRequest) Fuzz(tb testing.TB, data []byte, method, addr string) *http.Request {
+	tb.Helper()
 
 	bodyReader := bytes.NewBuffer(data)
 
 	req, err := http.NewRequest(method, addr, bodyReader)
 	if err != nil {
-		t.Skipf("Skipping test: not enough data for fuzzing: %s", err.Error())
+		tb.Skipf("Skipping test: not enough data for fuzzing: %s", err.Error())
 	}
 
 	// Get the address of the local listener in order to attach it to an Origin header.
@@ -130,10 +129,13 @@ func (s *fuzzRequest) Fuzz(t testing.TB, data []byte, method, addr string) *http
 
 	fuzzConsumer := fuzz.NewConsumer(data)
 	var headersMap map[string]string
-	fuzzConsumer.FuzzMap(&headersMap)
+	err = fuzzConsumer.FuzzMap(&headersMap)
+	if err != nil {
+		tb.Skipf("Skipping test: not enough data for fuzzing: %s", err.Error())
+	}
 
 	for k, v := range headersMap {
-		for i := 0; i < len(v); i++ {
+		for range len(v) {
 			req.Header.Add(k, v)
 		}
 	}
@@ -144,16 +146,3 @@ func (s *fuzzRequest) Fuzz(t testing.TB, data []byte, method, addr string) *http
 
 	return req
 }
-
-func GetPortFromEnv(env string, defaultPort int) (port int, err error) {
-	portEnv := os.Getenv(env)
-	if portEnv == "" {
-		return defaultPort, nil
-	}
-
-	port, err = strconv.Atoi(portEnv)
-	if err != nil {
-		return 0, fmt.Errorf("failed to parse port env var %s: %w", env, err)
-	}
-	return port, nil
-}
diff --git a/images/dvcr-artifact/pkg/retry/backoff.go b/images/dvcr-artifact/pkg/retry/backoff.go
index 806588499f..1622252f4c 100644
--- a/images/dvcr-artifact/pkg/retry/backoff.go
+++ b/images/dvcr-artifact/pkg/retry/backoff.go
@@ -106,10 +106,11 @@ func (b *Backoff) Step() time.Duration {
 // In all other cases, ErrWaitTimeout is returned.
 func ExponentialBackoff(ctx context.Context, f Fn, backoff Backoff) error {
 	const (
-		dvcrNoSpaceError         = "no space left on device"
-		dvcrInternalErrorPattern = "UNKNOWN: unknown error;"
-		dvcrNoSpaceErrMessage    = "DVCR is overloaded"
-		internalDvcrErrMessage   = "Internal DVCR error (could it be overloaded?)"
+		dvcrNoSpaceError             = "no space left on device"
+		dvcrInternalErrorPattern     = "UNKNOWN: unknown error;"
+		dvcrNoSpaceErrMessage        = "DVCR is overloaded"
+		internalDvcrErrMessage       = "Internal DVCR error (could it be overloaded?)"
+		datasourceCreatingErrMessage = "error creating data source"
 	)
 
 	var err error
@@ -124,6 +125,8 @@ func ExponentialBackoff(ctx context.Context, f Fn, backoff Backoff) error {
 			return fmt.Errorf("%s: %w", dvcrNoSpaceErrMessage, err)
 		case strings.Contains(err.Error(), dvcrInternalErrorPattern):
 			return fmt.Errorf("%s: %w", internalDvcrErrMessage, err)
+		case strings.Contains(err.Error(), datasourceCreatingErrMessage):
+			return err
 		}
 
 		if backoff.Steps == 1 {
diff --git a/images/dvcr-artifact/pkg/uploader/uploader.go b/images/dvcr-artifact/pkg/uploader/uploader.go
index 6fbaec2ad2..e3fb281761 100644
--- a/images/dvcr-artifact/pkg/uploader/uploader.go
+++ b/images/dvcr-artifact/pkg/uploader/uploader.go
@@ -345,11 +345,11 @@ func (app *uploadServerApp) processUpload(irc imageReadCloser, w http.ResponseWr
 		w.WriteHeader(http.StatusBadRequest)
 	}
 
-	err = app.upload(readCloser, cdiContentType, dvContentType, parseHTTPHeader(r))
-
 	app.mutex.Lock()
 	defer app.mutex.Unlock()
 
+	err = app.upload(readCloser, cdiContentType, dvContentType, parseHTTPHeader(r))
+
 	if err != nil {
 		klog.Errorf("Saving stream failed: %s", err)
 		w.WriteHeader(http.StatusInternalServerError)
diff --git a/images/dvcr/werf.inc.yaml b/images/dvcr/werf.inc.yaml
index b1a24c19a6..5fb79e3816 100644
--- a/images/dvcr/werf.inc.yaml
+++ b/images/dvcr/werf.inc.yaml
@@ -14,7 +14,9 @@ shell:
   - |
     mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
     echo "Git clone CDI repository..."
-    git clone --depth 1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch v{{ $version }} /distribution
+    mkdir -p /src
+    git clone --depth 1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch v{{ $version }} /src/distribution
+
 
 ---
 image: {{ .ModuleNamePrefix }}{{ .ImageName }}
@@ -39,13 +41,13 @@ imageSpec:
 ---
 image: {{ .ModuleNamePrefix }}{{ .ImageName }}-builder
 final: false
-fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.23" "builder/alt-go-svace" }}
+fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.24" "builder/alt-go-svace" }}
 mount:
   - fromPath: ~/go-pkg-cache
     to: /go/pkg
 import:
 - image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
-  add: /distribution
+  add: /src/distribution
   to: /distribution
   before: install
 secrets:
diff --git a/images/hooks/werf.inc.yaml b/images/hooks/werf.inc.yaml
index 7749a8da83..6091dab834 100644
--- a/images/hooks/werf.inc.yaml
+++ b/images/hooks/werf.inc.yaml
@@ -4,36 +4,30 @@ final: false
 fromImage: builder/src
 git:
 - add: {{ .ModuleDir }}/images/{{ .ImageName }}
-  to: /app/images/hooks
+  to: /src/images/hooks
   stageDependencies:
     install:
-    - go.mod
-    - go.sum
-    setup:
-    - "**/*.go"
+    - "**/*"
 - add: {{ .ModuleDir }}/images/virtualization-artifact
-  to: /app/images/virtualization-artifact
+  to: /src/images/virtualization-artifact
   stageDependencies:
     install:
-      - go.mod
-      - go.sum
-    setup:
-      - "**/*.go"
+      - "**/*"
 - add: {{ .ModuleDir }}/api
-  to: /app/api
+  to: /src/api
   stageDependencies:
     install:
-      - go.mod
-      - go.sum
-    setup:
-      - "**/*.go"
+      - "**/*"
+shell:
+  install:
+  - cd /src
 ---
 image: {{ .ModuleNamePrefix }}go-hooks-artifact
 final: false
 fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.24" "builder/alt-go-svace" }}
 import:
   - image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
-    add: /app
+    add: /src
     to: /app
     before: install
 mount:
diff --git a/images/libvirt/werf.inc.yaml b/images/libvirt/werf.inc.yaml
index db1f26fa32..677d24d730 100644
--- a/images/libvirt/werf.inc.yaml
+++ b/images/libvirt/werf.inc.yaml
@@ -8,7 +8,7 @@ final: false
 fromImage: builder/src
 git:
 - add: {{ .ModuleDir }}/images/{{ .ImageName }}
-  to: /
+  to: /src
   includePaths:
   - install-libvirt.sh
   - patches
@@ -23,9 +23,9 @@ secrets:
 shell:
   install:
   - |
-    git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /{{ $gitRepoName }}-{{ $version }}
+    git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src/{{ $gitRepoName }}-{{ $version }}
 
-    cd /{{ $gitRepoName }}-{{ $version }}
+    cd /src/{{ $gitRepoName }}-{{ $version }}
 
     if [[ "$(cat /run/secrets/SOURCE_REPO)" =~ "github.com" ]] ; then
       echo "Checkout submodules"
@@ -72,11 +72,9 @@ altLibraries:
 - libdevmapper-devel
 - ceph-devel
 - libiscsi-devel libglusterfs-devel
-- libgnutls-devel
 - libsystemd-devel
 - systemtap-sdt-devel
-- libacl-devel glib2-devel glibc-utils
-- libgio-devel
+- glibc-utils
 - wireshark-devel
 - libclocale
 - libslirp-devel
@@ -92,7 +90,8 @@ packages:
 - selinux
 - cyrus-sasl2
 - libtasn1 libtirpc
-- libunistring libxml2
+- glib2 acl libunistring libxml2
+- gnutls
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}
@@ -101,15 +100,15 @@ final: false
 fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/alt" "builder/alt-go-svace" }}
 import:
 - image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
-  add: /{{ $gitRepoName }}-{{ $version }}
+  add: /src/{{ $gitRepoName }}-{{ $version }}
   to: /{{ $gitRepoName }}-{{ $version }}
   before: install
 - image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
-  add: /patches
+  add: /src/patches
   to: /patches
   before: install
 - image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
-  add: /install-libvirt.sh
+  add: /src/install-libvirt.sh
   to: /install-libvirt.sh
   before: install
 {{- include "importPackageImages" (list . $builderDependencies.packages "install") -}}
diff --git a/images/packages/e2fsprogs/werf.inc.yaml b/images/packages/e2fsprogs/werf.inc.yaml
index 2edcbd116b..a3e0096056 100644
--- a/images/packages/e2fsprogs/werf.inc.yaml
+++ b/images/packages/e2fsprogs/werf.inc.yaml
@@ -27,10 +27,9 @@ shell:
 altPackages:
 - gcc git make libtool gettext-tools
 - libuuid-devel libarchive-devel
-- glib2-devel
 - tree
 packages:
-- util-linux acl
+- glib2 util-linux acl
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}
@@ -59,7 +58,6 @@ shell:
   install:
   - |
     # Install packages
-    echo "Install packages"
     PKGS="{{ $builderDependencies.packages | join " " }}"
     for pkg in $PKGS; do
       cp -a /$pkg/. /
diff --git a/images/packages/gcc/README.md b/images/packages/gcc/README.md
new file mode 100644
index 0000000000..79f5e26b2e
--- /dev/null
+++ b/images/packages/gcc/README.md
@@ -0,0 +1,1649 @@
+# gcc
+```
+└── [drwxr-xr-x     6]  usr
+    ├── [drwxr-xr-x    20]  bin
+    │   ├── [-rwxr-xr-x  1.6M]  c++-13.2.0
+    │   ├── [-rwxr-xr-x  1.6M]  cpp-13.2.0
+    │   ├── [-rwxr-xr-x  1.6M]  g++-13.2.0
+    │   ├── [-rwxr-xr-x  1.6M]  gcc-13.2.0
+    │   ├── [-rwxr-xr-x   35K]  gcc-ar-13.2.0
+    │   ├── [-rwxr-xr-x   35K]  gcc-nm-13.2.0
+    │   ├── [-rwxr-xr-x   35K]  gcc-ranlib-13.2.0
+    │   ├── [-rwxr-xr-x  1.0M]  gcov-13.2.0
+    │   ├── [-rwxr-xr-x  976K]  gcov-dump-13.2.0
+    │   ├── [-rwxr-xr-x  936K]  gcov-tool-13.2.0
+    │   ├── [-rwxr-xr-x   31M]  lto-dump-13.2.0
+    │   ├── [-rwxr-xr-x  1.6M]  x86_64-linux-gnu-c++-13.2.0
+    │   ├── [-rwxr-xr-x  1.6M]  x86_64-linux-gnu-g++-13.2.0
+    │   ├── [-rwxr-xr-x  1.6M]  x86_64-linux-gnu-gcc-13.2.0
+    │   ├── [-rwxr-xr-x   35K]  x86_64-linux-gnu-gcc-ar-13.2.0
+    │   ├── [-rwxr-xr-x   35K]  x86_64-linux-gnu-gcc-nm-13.2.0
+    │   ├── [-rwxr-xr-x   35K]  x86_64-linux-gnu-gcc-ranlib-13.2.0
+    │   └── [-rwxr-xr-x  1.6M]  x86_64-linux-gnu-gcc-tmp
+    ├── [drwxr-xr-x     3]  include
+    │   └── [drwxr-xr-x     3]  c++
+    │       └── [drwxr-xr-x   126]  13.2.0
+    │           ├── [-rw-r--r--  3.0K]  algorithm
+    │           ├── [-rw-r--r--   18K]  any
+    │           ├── [-rw-r--r--   14K]  array
+    │           ├── [-rw-r--r--   50K]  atomic
+    │           ├── [drwxr-xr-x    10]  backward
+    │           │   ├── [-rw-r--r--   11K]  auto_ptr.h
+    │           │   ├── [-rw-r--r--  2.4K]  backward_warning.h
+    │           │   ├── [-rw-r--r--  7.1K]  binders.h
+    │           │   ├── [-rw-r--r--  4.1K]  hash_fun.h
+    │           │   ├── [-rw-r--r--   17K]  hash_map
+    │           │   ├── [-rw-r--r--   17K]  hash_set
+    │           │   ├── [-rw-r--r--   33K]  hashtable.h
+    │           │   └── [-rw-r--r--  7.3K]  strstream
+    │           ├── [-rw-r--r--  7.9K]  barrier
+    │           ├── [-rw-r--r--   14K]  bit
+    │           ├── [drwxr-xr-x   157]  bits
+    │           │   ├── [-rw-r--r--   24K]  algorithmfwd.h
+    │           │   ├── [-rw-r--r--  3.6K]  align.h
+    │           │   ├── [-rw-r--r--   30K]  alloc_traits.h
+    │           │   ├── [-rw-r--r--  3.3K]  allocated_ptr.h
+    │           │   ├── [-rw-r--r--  8.6K]  allocator.h
+    │           │   ├── [-rw-r--r--   59K]  atomic_base.h
+    │           │   ├── [-rw-r--r--   12K]  atomic_futex.h
+    │           │   ├── [-rw-r--r--  2.3K]  atomic_lockfree_defines.h
+    │           │   ├── [-rw-r--r--   13K]  atomic_timed_wait.h
+    │           │   ├── [-rw-r--r--   12K]  atomic_wait.h
+    │           │   ├── [-rw-r--r--   16K]  basic_ios.h
+    │           │   ├── [-rw-r--r--  5.7K]  basic_ios.tcc
+    │           │   ├── [-rw-r--r--  156K]  basic_string.h
+    │           │   ├── [-rw-r--r--   30K]  basic_string.tcc
+    │           │   ├── [-rw-r--r--   29K]  boost_concept_check.h
+    │           │   ├── [-rw-r--r--  1.4K]  c++0x_warning.h
+    │           │   ├── [-rw-r--r--   29K]  char_traits.h
+    │           │   ├── [-rw-r--r--  3.6K]  charconv.h
+    │           │   ├── [-rw-r--r--   47K]  chrono.h
+    │           │   ├── [-rw-r--r--   74K]  chrono_io.h
+    │           │   ├── [-rw-r--r--   25K]  codecvt.h
+    │           │   ├── [-rw-r--r--  3.3K]  concept_check.h
+    │           │   ├── [-rw-r--r--  131K]  cow_string.h
+    │           │   ├── [-rw-r--r--   15K]  cpp_type_traits.h
+    │           │   ├── [-rw-r--r--  1.8K]  cxxabi_forced.h
+    │           │   ├── [-rw-r--r--  2.2K]  cxxabi_init_exception.h
+    │           │   ├── [-rw-r--r--   41K]  deque.tcc
+    │           │   ├── [-rw-r--r--   12K]  enable_special_members.h
+    │           │   ├── [-rw-r--r--  2.1K]  erase_if.h
+    │           │   ├── [-rw-r--r--  2.4K]  exception.h
+    │           │   ├── [-rw-r--r--  1.6K]  exception_defines.h
+    │           │   ├── [-rw-r--r--  8.1K]  exception_ptr.h
+    │           │   ├── [-rw-r--r--   50K]  forward_list.h
+    │           │   ├── [-rw-r--r--   14K]  forward_list.tcc
+    │           │   ├── [-rw-r--r--   17K]  fs_dir.h
+    │           │   ├── [-rw-r--r--   11K]  fs_fwd.h
+    │           │   ├── [-rw-r--r--   10K]  fs_ops.h
+    │           │   ├── [-rw-r--r--   41K]  fs_path.h
+    │           │   ├── [-rw-r--r--   33K]  fstream.tcc
+    │           │   ├── [-rw-r--r--  4.0K]  functexcept.h
+    │           │   ├── [-rw-r--r--  8.8K]  functional_hash.h
+    │           │   ├── [-rw-r--r--  5.4K]  gslice.h
+    │           │   ├── [-rw-r--r--  7.7K]  gslice_array.h
+    │           │   ├── [-rw-r--r--  2.1K]  hash_bytes.h
+    │           │   ├── [-rw-r--r--   88K]  hashtable.h
+    │           │   ├── [-rw-r--r--   64K]  hashtable_policy.h
+    │           │   ├── [-rw-r--r--  7.7K]  indirect_array.h
+    │           │   ├── [-rw-r--r--  6.1K]  invoke.h
+    │           │   ├── [-rw-r--r--   32K]  ios_base.h
+    │           │   ├── [-rw-r--r--   32K]  istream.tcc
+    │           │   ├── [-rw-r--r--   34K]  iterator_concepts.h
+    │           │   ├── [-rw-r--r--   18K]  list.tcc
+    │           │   ├── [-rw-r--r--   25K]  locale_classes.h
+    │           │   ├── [-rw-r--r--   11K]  locale_classes.tcc
+    │           │   ├── [-rw-r--r--   19K]  locale_conv.h
+    │           │   ├── [-rw-r--r--   92K]  locale_facets.h
+    │           │   ├── [-rw-r--r--   40K]  locale_facets.tcc
+    │           │   ├── [-rw-r--r--   69K]  locale_facets_nonio.h
+    │           │   ├── [-rw-r--r--   56K]  locale_facets_nonio.tcc
+    │           │   ├── [-rw-r--r--  5.8K]  localefwd.h
+    │           │   ├── [-rw-r--r--  7.8K]  mask_array.h
+    │           │   ├── [-rw-r--r--   22K]  max_size_type.h
+    │           │   ├── [-rw-r--r--   16K]  memory_resource.h
+    │           │   ├── [-rw-r--r--  2.5K]  memoryfwd.h
+    │           │   ├── [-rw-r--r--  7.5K]  mofunc_impl.h
+    │           │   ├── [-rw-r--r--  6.5K]  move.h
+    │           │   ├── [-rw-r--r--  6.1K]  move_only_function.h
+    │           │   ├── [-rw-r--r--  7.5K]  nested_exception.h
+    │           │   ├── [-rw-r--r--  7.2K]  new_allocator.h
+    │           │   ├── [-rw-r--r--   11K]  node_handle.h
+    │           │   ├── [-rw-r--r--   12K]  ostream.tcc
+    │           │   ├── [-rw-r--r--  4.0K]  ostream_insert.h
+    │           │   ├── [-rw-r--r--  7.8K]  parse_numbers.h
+    │           │   ├── [-rw-r--r--  7.3K]  postypes.h
+    │           │   ├── [-rw-r--r--  9.9K]  predefined_ops.h
+    │           │   ├── [-rw-r--r--  8.3K]  ptr_traits.h
+    │           │   ├── [-rw-r--r--  5.0K]  quoted_string.h
+    │           │   ├── [-rw-r--r--  179K]  random.h
+    │           │   ├── [-rw-r--r--  103K]  random.tcc
+    │           │   ├── [-rw-r--r--   12K]  range_access.h
+    │           │   ├── [-rw-r--r--  129K]  ranges_algo.h
+    │           │   ├── [-rw-r--r--   18K]  ranges_algobase.h
+    │           │   ├── [-rw-r--r--   29K]  ranges_base.h
+    │           │   ├── [-rw-r--r--  5.9K]  ranges_cmp.h
+    │           │   ├── [-rw-r--r--   18K]  ranges_uninitialized.h
+    │           │   ├── [-rw-r--r--   25K]  ranges_util.h
+    │           │   ├── [-rw-r--r--   13K]  refwrap.h
+    │           │   ├── [-rw-r--r--  104K]  regex.h
+    │           │   ├── [-rw-r--r--   16K]  regex.tcc
+    │           │   ├── [-rw-r--r--   11K]  regex_automaton.h
+    │           │   ├── [-rw-r--r--  7.6K]  regex_automaton.tcc
+    │           │   ├── [-rw-r--r--   16K]  regex_compiler.h
+    │           │   ├── [-rw-r--r--   18K]  regex_compiler.tcc
+    │           │   ├── [-rw-r--r--   15K]  regex_constants.h
+    │           │   ├── [-rw-r--r--  5.4K]  regex_error.h
+    │           │   ├── [-rw-r--r--  8.8K]  regex_executor.h
+    │           │   ├── [-rw-r--r--   18K]  regex_executor.tcc
+    │           │   ├── [-rw-r--r--  6.9K]  regex_scanner.h
+    │           │   ├── [-rw-r--r--   15K]  regex_scanner.tcc
+    │           │   ├── [-rw-r--r--  1.4K]  requires_hosted.h
+    │           │   ├── [-rw-r--r--  7.7K]  semaphore_base.h
+    │           │   ├── [-rw-r--r--   38K]  shared_ptr.h
+    │           │   ├── [-rw-r--r--   23K]  shared_ptr_atomic.h
+    │           │   ├── [-rw-r--r--   65K]  shared_ptr_base.h
+    │           │   ├── [-rw-r--r--  9.4K]  slice_array.h
+    │           │   ├── [-rw-r--r--   46K]  specfun.h
+    │           │   ├── [-rw-r--r--  9.9K]  sstream.tcc
+    │           │   ├── [-rw-r--r--  4.6K]  std_abs.h
+    │           │   ├── [-rw-r--r--   23K]  std_function.h
+    │           │   ├── [-rw-r--r--  6.7K]  std_mutex.h
+    │           │   ├── [-rw-r--r--  9.8K]  std_thread.h
+    │           │   ├── [-rw-r--r--  212K]  stl_algo.h
+    │           │   ├── [-rw-r--r--   75K]  stl_algobase.h
+    │           │   ├── [-rw-r--r--   41K]  stl_bvector.h
+    │           │   ├── [-rw-r--r--  8.5K]  stl_construct.h
+    │           │   ├── [-rw-r--r--   76K]  stl_deque.h
+    │           │   ├── [-rw-r--r--   44K]  stl_function.h
+    │           │   ├── [-rw-r--r--   20K]  stl_heap.h
+    │           │   ├── [-rw-r--r--   93K]  stl_iterator.h
+    │           │   ├── [-rw-r--r--  8.7K]  stl_iterator_base_funcs.h
+    │           │   ├── [-rw-r--r--  9.5K]  stl_iterator_base_types.h
+    │           │   ├── [-rw-r--r--   71K]  stl_list.h
+    │           │   ├── [-rw-r--r--   55K]  stl_map.h
+    │           │   ├── [-rw-r--r--   43K]  stl_multimap.h
+    │           │   ├── [-rw-r--r--   37K]  stl_multiset.h
+    │           │   ├── [-rw-r--r--   14K]  stl_numeric.h
+    │           │   ├── [-rw-r--r--   36K]  stl_pair.h
+    │           │   ├── [-rw-r--r--   28K]  stl_queue.h
+    │           │   ├── [-rw-r--r--  3.9K]  stl_raw_storage_iter.h
+    │           │   ├── [-rw-r--r--  4.5K]  stl_relops.h
+    │           │   ├── [-rw-r--r--   37K]  stl_set.h
+    │           │   ├── [-rw-r--r--   14K]  stl_stack.h
+    │           │   ├── [-rw-r--r--  8.7K]  stl_tempbuf.h
+    │           │   ├── [-rw-r--r--   72K]  stl_tree.h
+    │           │   ├── [-rw-r--r--   36K]  stl_uninitialized.h
+    │           │   ├── [-rw-r--r--   69K]  stl_vector.h
+    │           │   ├── [-rw-r--r--  8.2K]  stream_iterator.h
+    │           │   ├── [-rw-r--r--  4.6K]  streambuf.tcc
+    │           │   ├── [-rw-r--r--   16K]  streambuf_iterator.h
+    │           │   ├── [-rw-r--r--  7.0K]  string_view.tcc
+    │           │   ├── [-rw-r--r--  2.6K]  stringfwd.h
+    │           │   ├── [-rw-r--r--  3.2K]  this_thread_sleep.h
+    │           │   ├── [-rw-r--r--   13K]  uniform_int_dist.h
+    │           │   ├── [-rw-r--r--  6.2K]  unique_lock.h
+    │           │   ├── [-rw-r--r--   36K]  unique_ptr.h
+    │           │   ├── [-rw-r--r--   75K]  unordered_map.h
+    │           │   ├── [-rw-r--r--   62K]  unordered_set.h
+    │           │   ├── [-rw-r--r--  6.9K]  uses_allocator.h
+    │           │   ├── [-rw-r--r--  8.5K]  uses_allocator_args.h
+    │           │   ├── [-rw-r--r--  8.2K]  utility.h
+    │           │   ├── [-rw-r--r--   23K]  valarray_after.h
+    │           │   ├── [-rw-r--r--   21K]  valarray_array.h
+    │           │   ├── [-rw-r--r--  7.1K]  valarray_array.tcc
+    │           │   ├── [-rw-r--r--   19K]  valarray_before.h
+    │           │   └── [-rw-r--r--   31K]  vector.tcc
+    │           ├── [-rw-r--r--   49K]  bitset
+    │           ├── [-rw-r--r--  1.6K]  cassert
+    │           ├── [-rw-r--r--  1.3K]  ccomplex
+    │           ├── [-rw-r--r--  2.4K]  cctype
+    │           ├── [-rw-r--r--  1.7K]  cerrno
+    │           ├── [-rw-r--r--  2.0K]  cfenv
+    │           ├── [-rw-r--r--  1.8K]  cfloat
+    │           ├── [-rw-r--r--   29K]  charconv
+    │           ├── [-rw-r--r--   93K]  chrono
+    │           ├── [-rw-r--r--  2.1K]  cinttypes
+    │           ├── [-rw-r--r--  1.4K]  ciso646
+    │           ├── [-rw-r--r--  1.9K]  climits
+    │           ├── [-rw-r--r--  1.9K]  clocale
+    │           ├── [-rw-r--r--   92K]  cmath
+    │           ├── [-rw-r--r--  5.2K]  codecvt
+    │           ├── [-rw-r--r--   37K]  compare
+    │           ├── [-rw-r--r--   74K]  complex
+    │           ├── [-rw-r--r--  1.6K]  complex.h
+    │           ├── [-rw-r--r--   13K]  concepts
+    │           ├── [-rw-r--r--   13K]  condition_variable
+    │           ├── [-rw-r--r--  9.4K]  coroutine
+    │           ├── [-rw-r--r--  1.9K]  csetjmp
+    │           ├── [-rw-r--r--  1.8K]  csignal
+    │           ├── [-rw-r--r--  1.4K]  cstdalign
+    │           ├── [-rw-r--r--  1.8K]  cstdarg
+    │           ├── [-rw-r--r--  1.4K]  cstdbool
+    │           ├── [-rw-r--r--  6.5K]  cstddef
+    │           ├── [-rw-r--r--  3.8K]  cstdint
+    │           ├── [-rw-r--r--  4.3K]  cstdio
+    │           ├── [-rw-r--r--  6.4K]  cstdlib
+    │           ├── [-rw-r--r--  3.1K]  cstring
+    │           ├── [-rw-r--r--  1.3K]  ctgmath
+    │           ├── [-rw-r--r--  2.2K]  ctime
+    │           ├── [-rw-r--r--  2.8K]  cuchar
+    │           ├── [-rw-r--r--  6.4K]  cwchar
+    │           ├── [-rw-r--r--  2.7K]  cwctype
+    │           ├── [-rw-r--r--   22K]  cxxabi.h
+    │           ├── [drwxr-xr-x    34]  debug
+    │           │   ├── [-rw-r--r--  2.3K]  assertions.h
+    │           │   ├── [-rw-r--r--   13K]  bitset
+    │           │   ├── [-rw-r--r--  6.0K]  debug.h
+    │           │   ├── [-rw-r--r--   18K]  deque
+    │           │   ├── [-rw-r--r--   18K]  formatter.h
+    │           │   ├── [-rw-r--r--   28K]  forward_list
+    │           │   ├── [-rw-r--r--   15K]  functions.h
+    │           ���   ├── [-rw-r--r--   10K]  helper_functions.h
+    │           │   ├── [-rw-r--r--   27K]  list
+    │           │   ├── [-rw-r--r--   20K]  macros.h
+    │           │   ├── [-rw-r--r--  1.6K]  map
+    │           │   ├── [-rw-r--r--   23K]  map.h
+    │           │   ├── [-rw-r--r--   20K]  multimap.h
+    │           │   ├── [-rw-r--r--   19K]  multiset.h
+    │           │   ├── [-rw-r--r--  9.1K]  safe_base.h
+    │           │   ├── [-rw-r--r--  3.8K]  safe_container.h
+    │           │   ├── [-rw-r--r--   31K]  safe_iterator.h
+    │           │   ├── [-rw-r--r--   19K]  safe_iterator.tcc
+    │           │   ├── [-rw-r--r--   13K]  safe_local_iterator.h
+    │           │   ├── [-rw-r--r--  2.8K]  safe_local_iterator.tcc
+    │           │   ├── [-rw-r--r--  5.0K]  safe_sequence.h
+    │           │   ├── [-rw-r--r--  4.9K]  safe_sequence.tcc
+    │           │   ├── [-rw-r--r--  6.7K]  safe_unordered_base.h
+    │           │   ├── [-rw-r--r--  5.9K]  safe_unordered_container.h
+    │           │   ├── [-rw-r--r--  3.2K]  safe_unordered_container.tcc
+    │           │   ├── [-rw-r--r--  1.6K]  set
+    │           │   ├── [-rw-r--r--   19K]  set.h
+    │           │   ├── [-rw-r--r--  5.4K]  stl_iterator.h
+    │           │   ├── [-rw-r--r--   36K]  string
+    │           │   ├── [-rw-r--r--   46K]  unordered_map
+    │           │   ├── [-rw-r--r--   41K]  unordered_set
+    │           │   └── [-rw-r--r--   24K]  vector
+    │           ├── [drwxr-xr-x     4]  decimal
+    │           │   ├── [-rw-r--r--   17K]  decimal
+    │           │   └── [-rw-r--r--   17K]  decimal.h
+    │           ├── [-rw-r--r--  4.4K]  deque
+    │           ├── [-rw-r--r--  5.3K]  exception
+    │           ├── [-rw-r--r--  1.8K]  execution
+    │           ├── [-rw-r--r--   48K]  expected
+    │           ├── [drwxr-xr-x    45]  experimental
+    │           │   ├── [-rw-r--r--  3.7K]  algorithm
+    │           │   ├── [-rw-r--r--   16K]  any
+    │           │   ├── [-rw-r--r--  3.4K]  array
+    │           │   ├── [drwxr-xr-x    22]  bits
+    │           │   │   ├── [-rw-r--r--   11K]  fs_dir.h
+    │           │   │   ├── [-rw-r--r--  8.8K]  fs_fwd.h
+    │           │   │   ├── [-rw-r--r--   10K]  fs_ops.h
+    │           │   │   ├── [-rw-r--r--   38K]  fs_path.h
+    │           │   │   ├── [-rw-r--r--  2.2K]  lfts_config.h
+    │           │   │   ├── [-rw-r--r--   10K]  net.h
+    │           │   │   ├── [-rw-r--r--   16K]  numeric_traits.h
+    │           │   │   ├── [-rw-r--r--   20K]  shared_ptr.h
+    │           │   │   ├── [-rw-r--r--  173K]  simd.h
+    │           │   │   ├── [-rw-r--r--  108K]  simd_builtin.h
+    │           │   │   ├── [-rw-r--r--   13K]  simd_converter.h
+    │           │   │   ├── [-rw-r--r--  9.9K]  simd_detail.h
+    │           │   │   ├── [-rw-r--r--   71K]  simd_fixed_size.h
+    │           │   │   ├── [-rw-r--r--   57K]  simd_math.h
+    │           │   │   ├── [-rw-r--r--   16K]  simd_neon.h
+    │           │   │   ├── [-rw-r--r--  4.8K]  simd_ppc.h
+    │           │   │   ├── [-rw-r--r--   23K]  simd_scalar.h
+    │           │   │   ├── [-rw-r--r--  195K]  simd_x86.h
+    │           │   │   ├── [-rw-r--r--   81K]  simd_x86_conversions.h
+    │           │   │   └── [-rw-r--r--  6.7K]  string_view.tcc
+    │           │   ├── [-rw-r--r--   28K]  buffer
+    │           │   ├── [-rw-r--r--  2.0K]  chrono
+    │           │   ├── [-rw-r--r--  2.5K]  contract
+    │           │   ├── [-rw-r--r--  2.3K]  deque
+    │           │   ├── [-rw-r--r--   55K]  executor
+    │           │   ├── [-rw-r--r--  1.6K]  filesystem
+    │           │   ├── [-rw-r--r--  2.4K]  forward_list
+    │           │   ├── [-rw-r--r--   12K]  functional
+    │           │   ├── [-rw-r--r--   68K]  internet
+    │           │   ├── [-rw-r--r--   22K]  io_context
+    │           │   ├── [-rw-r--r--  3.5K]  iterator
+    │           │   ├── [-rw-r--r--  2.3K]  list
+    │           │   ├── [-rw-r--r--  2.8K]  map
+    │           │   ├── [-rw-r--r--  6.0K]  memory
+    │           │   ├── [-rw-r--r--   18K]  memory_resource
+    │           │   ├── [-rw-r--r--  1.6K]  net
+    │           │   ├── [-rw-r--r--  3.7K]  netfwd
+    │           │   ├── [-rw-r--r--  3.4K]  numeric
+    │           │   ├── [-rw-r--r--   26K]  optional
+    │           │   ├── [-rw-r--r--   17K]  propagate_const
+    │           │   ├── [-rw-r--r--  2.6K]  random
+    │           │   ├── [-rw-r--r--  2.5K]  ratio
+    │           │   ├── [-rw-r--r--  2.1K]  regex
+    │           │   ├── [-rw-r--r--   14K]  scope
+    │           │   ├── [-rw-r--r--  2.7K]  set
+    │           │   ├── [-rw-r--r--  2.8K]  simd
+    │           │   ├── [-rw-r--r--   76K]  socket
+    │           │   ├── [-rw-r--r--  2.8K]  source_location
+    │           │   ├── [-rw-r--r--  2.9K]  string
+    │           │   ├── [-rw-r--r--   22K]  string_view
+    │           │   ├── [-rw-r--r--  3.3K]  synchronized_value
+    │           │   ├── [-rw-r--r--  2.1K]  system_error
+    │           │   ├── [-rw-r--r--  5.7K]  timer
+    │           │   ├── [-rw-r--r--  2.5K]  tuple
+    │           │   ├── [-rw-r--r--   12K]  type_traits
+    │           │   ├── [-rw-r--r--  3.1K]  unordered_map
+    │           │   ├── [-rw-r--r--  2.9K]  unordered_set
+    │           │   ├── [-rw-r--r--  1.8K]  utility
+    │           │   └── [-rw-r--r--  2.4K]  vector
+    │           ├── [drwxr-xr-x    46]  ext
+    │           │   ├── [-rw-r--r--   19K]  algorithm
+    │           │   ├── [-rw-r--r--  4.0K]  aligned_buffer.h
+    │           │   ├── [-rw-r--r--  6.5K]  alloc_traits.h
+    │           │   ├── [-rw-r--r--  3.7K]  atomicity.h
+    │           │   ├── [-rw-r--r--   31K]  bitmap_allocator.h
+    │           │   ├── [-rw-r--r--  4.3K]  cast.h
+    │           │   ├── [-rw-r--r--  6.5K]  cmath
+    │           │   ├── [-rw-r--r--   16K]  codecvt_specializations.h
+    │           │   ├── [-rw-r--r--  7.4K]  concurrence.h
+    │           │   ├── [-rw-r--r--  5.8K]  debug_allocator.h
+    │           │   ├── [-rw-r--r--  2.3K]  enc_filebuf.h
+    │           │   ├── [-rw-r--r--  6.3K]  extptr_allocator.h
+    │           │   ├── [-rw-r--r--   14K]  functional
+    │           │   ├── [-rw-r--r--   17K]  hash_map
+    │           │   ├── [-rw-r--r--   17K]  hash_set
+    │           │   ├── [-rw-r--r--  3.9K]  iterator
+    │           │   ├── [-rw-r--r--  6.0K]  malloc_allocator.h
+    │           │   ├── [-rw-r--r--  7.1K]  memory
+    │           │   ├── [-rw-r--r--   23K]  mt_allocator.h
+    │           │   ├── [-rw-r--r--  2.5K]  new_allocator.h
+    │           │   ├── [-rw-r--r--  4.7K]  numeric
+    │           │   ├── [-rw-r--r--  8.0K]  numeric_traits.h
+    │           │   ├── [drwxr-xr-x    11]  pb_ds
+    │           │   │   ├── [-rw-r--r--   29K]  assoc_container.hpp
+    │           │   │   ├── [drwxr-xr-x    33]  detail
+    │           │   │   │   ├── [drwxr-xr-x    17]  bin_search_tree_
+    │           │   │   │   │   ├── [-rw-r--r--   12K]  bin_search_tree_.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  5.4K]  constructors_destructor_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  7.9K]  debug_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.9K]  erase_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  4.6K]  find_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.1K]  info_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  5.4K]  insert_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.5K]  iterators_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  5.8K]  node_iterators.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  8.8K]  point_iterators.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  1.9K]  policy_access_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.9K]  r_erase_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  4.1K]  rotate_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.9K]  split_join_fn_imps.hpp
+    │           │   │   │   │   └── [-rw-r--r--  6.2K]  traits.hpp
+    │           │   │   │   ├── [drwxr-xr-x    18]  binary_heap_
+    │           │   │   │   │   ├── [-rw-r--r--  8.8K]  binary_heap_.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  4.2K]  const_iterator.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  4.1K]                                  ↵
+
+    │           │   │   │   │   ├── [-rw-r--r--  2.5K]  debug_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.7K]  entry_cmp.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.7K]  entry_pred.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  5.4K]  erase_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.6K]  find_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.1K]  info_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  4.9K]  insert_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.2K]  iterators_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  4.3K]  point_const_iterator.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  1.9K]  policy_access_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  6.0K]  resize_policy.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  4.8K]  split_join_fn_imps.hpp
+    │           │   │   │   │   └── [-rw-r--r--  2.4K]  trace_fn_imps.hpp
+    │           │   │   │   ├── [drwxr-xr-x     5]  binomial_heap_
+    │           │   │   │   │   ├── [-rw-r--r--  3.8K]  binomial_heap_.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.1K]  constructors_destructor_fn_imps.hpp
+    │           │   │   │   │   └── [-rw-r--r--  1.9K]  debug_fn_imps.hpp
+    │           │   │   │   ├── [drwxr-xr-x     9]  binomial_heap_base_
+    │           │   │   │   │   ├── [-rw-r--r--  6.0K]  binomial_heap_base_.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.7K]  constructors_destructor_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.4K]  debug_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  4.4K]  erase_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.3K]  find_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  5.2K]  insert_fn_imps.hpp
+    │           │   │   │   │   └── [-rw-r--r--  5.3K]  split_join_fn_imps.hpp
+    │           │   │   │   ├── [drwxr-xr-x     5]  branch_policy
+    │           │   │   │   │   ├── [-rw-r--r--  3.9K]  branch_policy.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.3K]  null_node_metadata.hpp
+    │           │   │   │   │   └── [-rw-r--r--  3.2K]  traits.hpp
+    │           │   │   │   ├── [drwxr-xr-x    28]  cc_hash_table_map_
+    │           │   │   │   │   ├── [-rw-r--r--   20K]  cc_ht_map_.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.7K]  cmp_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.8K]  cond_key_dtor_entry_dealtor.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  5.7K]  constructor_destructor_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.2K]                                         ↵
+constructor_destructor_no_store_hash_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.3K]                                         ↵
+constructor_destructor_store_hash_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.7K]  debug_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.0K]  debug_no_store_hash_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.1K]  debug_store_hash_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.9K]  entry_list_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.2K]  erase_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.2K]  erase_no_store_hash_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.2K]  erase_store_hash_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.5K]  find_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  1.7K]  find_store_hash_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.1K]  info_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  1.9K]  insert_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.6K]  insert_no_store_hash_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.6K]  insert_store_hash_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.6K]  iterators_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.5K]  policy_access_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  4.0K]  resize_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.2K]  resize_no_store_hash_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.3K]  resize_store_hash_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.1K]  size_fn_imps.hpp
+    │           │   │   │   │   └── [-rw-r--r--  2.3K]  trace_fn_imps.hpp
+    │           │   │   │   ├── [-rw-r--r--  2.7K]  cond_dealtor.hpp
+    │           │   │   │   ├── [-rw-r--r--   13K]  container_base_dispatch.hpp
+    │           │   │   │   ├── [-rw-r--r--  8.5K]  debug_map_base.hpp
+    │           │   │   │   ├── [drwxr-xr-x     4]  eq_fn
+    │           │   │   │   │   ├── [-rw-r--r--  2.3K]  eq_by_less.hpp
+    │           │   │   │   │   └── [-rw-r--r--  3.7K]  hash_eq_fn.hpp
+    │           │   │   │   ├── [drwxr-xr-x    25]  gp_hash_table_map_
+    │           │   │   │   │   ├── [-rw-r--r--  6.5K]  constructor_destructor_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.2K]                                  ↵
+
+constructor_destructor_no_store_hash_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.2K]                                     ↵
+
+constructor_destructor_store_hash_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.2K]  debug_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.5K]  debug_no_store_hash_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.6K]  debug_store_hash_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.2K]  erase_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.8K]  erase_no_store_hash_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.9K]  erase_store_hash_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.5K]  find_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  1.9K]  find_no_store_hash_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  1.7K]  find_store_hash_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--   20K]  gp_ht_map_.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.1K]  info_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  1.9K]  insert_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.7K]  insert_no_store_hash_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  4.0K]  insert_store_hash_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.6K]  iterator_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.6K]  policy_access_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  4.1K]  resize_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.6K]  resize_no_store_hash_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.6K]  resize_store_hash_fn_imps.hpp
+    │           │   │   │   │   └── [-rw-r--r--  2.4K]  trace_fn_imps.hpp
+    │           │   │   │   ├── [drwxr-xr-x    15]  hash_fn
+    │           │   │   │   │   ├── [-rw-r--r--  2.1K]  direct_mask_range_hashing_imp.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.1K]  direct_mod_range_hashing_imp.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  1.9K]  linear_probe_fn_imp.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.2K]  mask_based_range_hashing.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.3K]  mod_based_range_hashing.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.0K]  probe_fn_base.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  1.9K]  quadratic_probe_fn_imp.hpp
+    │           │��  │   │   │   ├── [-rw-r--r--   10K]  ranged_hash_fn.hpp
+    │           │   │   │   │   ├── [-rw-r--r--   10K]  ranged_probe_fn.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.2K]  sample_probe_fn.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.4K]  sample_range_hashing.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.4K]  sample_ranged_hash_fn.hpp
+    │           │   │   │   │   └── [-rw-r--r--  2.5K]  sample_ranged_probe_fn.hpp
+    │           │   │   │   ├── [drwxr-xr-x    14]  left_child_next_sibling_heap_
+    │           │   │   │   │   ├── [-rw-r--r--  4.8K]  const_iterator.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  4.0K]  constructors_destructor_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  4.0K]  debug_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.9K]  erase_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.1K]  info_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  5.1K]  insert_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.5K]  iterators_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  8.0K]  left_child_next_sibling_heap_.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.2K]  node.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  4.3K]  point_const_iterator.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  1.9K]  policy_access_fn_imps.hpp
+    │           │   │   │   │   └── [-rw-r--r--  2.8K]  trace_fn_imps.hpp
+    │           │   │   │   ├── [drwxr-xr-x    12]  list_update_map_
+    │           │   │   │   │   ├── [-rw-r--r--  3.5K]  constructor_destructor_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.1K]  debug_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.1K]  entry_metadata_base.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.4K]  erase_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.8K]  find_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.1K]  info_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.5K]  insert_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.5K]  iterators_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--   10K]  lu_map_.hpp
+    │           │   │   │   │   └── [-rw-r--r--  2.0K]  trace_fn_imps.hpp
+    │           │   │   │   ├── [drwxr-xr-x     4]  list_update_policy
+    │           │   │   │   │   ├── [-rw-r--r--  2.8K]  lu_counter_metadata.hpp
+    │           │   │   │   │   └── [-rw-r--r--  2.6K]  sample_update_policy.hpp
+    │           │   │   │   ├── [drwxr-xr-x    13]  ov_tree_map_
+    │           │   │   │   │   ├── [-rw-r--r--  6.8K]  constructors_destructor_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.8K]  debug_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  4.9K]  erase_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.1K]  info_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.3K]  insert_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.3K]  iterators_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  8.4K]  node_iterators.hpp
+    │           │   │   │   │   ├── [-rw-r--r--   15K]  ov_tree_map_.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  1.9K]  policy_access_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.7K]  split_join_fn_imps.hpp
+    │           │   │   │   │   └── [-rw-r--r--  4.5K]  traits.hpp
+    │           │   │   │   ├── [drwxr-xr-x     9]  pairing_heap_
+    │           │   │   │   │   ├── [-rw-r--r--  2.5K]  constructors_destructor_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.0K]  debug_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  7.1K]  erase_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  1.9K]  find_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.9K]  insert_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  5.4K]  pairing_heap_.hpp
+    │           │   │   │   │   └── [-rw-r--r--  3.7K]  split_join_fn_imps.hpp
+    │           │   │   │   ├── [drwxr-xr-x    19]  pat_trie_
+    │           │   │   │   │   ├── [-rw-r--r--  5.6K]  constructors_destructor_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.7K]  debug_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  7.8K]  erase_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  7.7K]  find_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.1K]  info_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--   14K]  insert_join_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.4K]  iterators_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--   16K]  pat_trie_.hpp
+    │           │   │   │   │   ├── [-rw-r--r--   36K]  pat_trie_base.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.2K]  policy_access_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.9K]  r_erase_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  4.3K]  rotate_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  7.6K]  split_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  6.6K]  synth_access_traits.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.4K]  trace_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  6.2K]  traits.hpp
+    │           │   │   │   │   └── [-rw-r--r--  2.0K]  update_fn_imps.hpp
+    │           │   │   │   ├── [-rw-r--r--  4.1K]  priority_queue_base_dispatch.hpp
+    │           │   │   │   ├── [drwxr-xr-x    12]  rb_tree_map_
+    │           │   │   │   │   ├── [-rw-r--r--  2.8K]  constructors_destructor_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.7K]  debug_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  6.9K]  erase_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  1.7K]  find_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  1.8K]  info_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.8K]  insert_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.6K]  node.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  7.8K]  rb_tree_.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  7.7K]  split_join_fn_imps.hpp
+    │           │   │   │   │   └── [-rw-r--r--  3.2K]  traits.hpp
+    │           │   │   │   ├── [drwxr-xr-x    10]  rc_binomial_heap_
+    │           │   │   │   │   ├── [-rw-r--r--  2.4K]  constructors_destructor_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.5K]  debug_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.9K]  erase_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  4.2K]  insert_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  6.1K]  rc.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  5.2K]  rc_binomial_heap_.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.4K]  split_join_fn_imps.hpp
+    │           │   │   │   │   └── [-rw-r--r--  1.9K]  trace_fn_imps.hpp
+    │           │   │   │   ├── [drwxr-xr-x    11]  resize_policy
+    │           │   │   │   │   ├── [-rw-r--r--  4.8K]                                         ↵
+cc_hash_max_collision_check_resize_trigger_imp.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.7K]  hash_exponential_size_policy_imp.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  7.6K]  hash_load_check_resize_trigger_imp.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.9K]                                     ↵
+
+hash_load_check_resize_trigger_size_base.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  6.3K]  hash_prime_size_policy_imp.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  6.2K]  hash_standard_resize_policy_imp.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.5K]  sample_resize_policy.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.8K]  sample_resize_trigger.hpp
+    │           │   │   │   │   └── [-rw-r--r--  2.4K]  sample_size_policy.hpp
+    │           │   │   │   ├── [drwxr-xr-x    13]  splay_tree_
+    │           │   │   │   │   ├── [-rw-r--r--  2.8K]  constructors_destructor_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.4K]  debug_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  4.2K]  erase_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.3K]  find_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  1.6K]  info_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.3K]  insert_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.5K]  node.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  7.9K]  splay_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  9.1K]  splay_tree_.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.6K]  split_join_fn_imps.hpp
+    │           │   │   │   │   └── [-rw-r--r--  3.3K]  traits.hpp
+    │           │   │   │   ├── [-rw-r--r--  4.9K]  standard_policies.hpp
+    │           │   │   │   ├── [drwxr-xr-x    10]  thin_heap_
+    │           │   │   │   │   ├── [-rw-r--r--  2.9K]  constructors_destructor_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.8K]  debug_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  5.9K]  erase_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  1.9K]  find_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  7.3K]  insert_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.1K]  split_join_fn_imps.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  8.2K]  thin_heap_.hpp
+    │           │   │   │   │   └── [-rw-r--r--  1.9K]  trace_fn_imps.hpp
+    │           │   │   │   ├── [drwxr-xr-x     5]  tree_policy
+    │           │   │   │   │   ├── [-rw-r--r--  3.3K]  node_metadata_selector.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  3.7K]  order_statistics_imp.hpp
+    │           │   │   │   │   └── [-rw-r--r--  2.3K]  sample_tree_node_update.hpp
+    │           │   │   │   ├── [-rw-r--r--  5.0K]  tree_trace_base.hpp
+    │           │   │   │   ├── [drwxr-xr-x     9]  trie_policy
+    │           │   │   │   │   ├── [-rw-r--r--  3.3K]  node_metadata_selector.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  4.6K]  order_statistics_imp.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  4.4K]  prefix_search_node_update_imp.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.6K]  sample_trie_access_traits.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  2.3K]  sample_trie_node_update.hpp
+    │           │   │   │   │   ├── [-rw-r--r--  5.7K]  trie_policy_base.hpp
+    │           │   │   │   │   └── [-rw-r--r--  3.0K]  trie_string_access_traits_imp.hpp
+    │           │   │   │   ├── [-rw-r--r--  4.3K]  type_utils.hpp
+    │           │   │   │   ├── [-rw-r--r--  6.3K]  types_traits.hpp
+    │           │   │   │   └── [drwxr-xr-x     6]  unordered_iterator
+    │           │   │   │       ├── [-rw-r--r--  3.4K]  const_iterator.hpp
+    │           │   │   │       ├── [-rw-r--r--  3.9K]  iterator.hpp
+    │           │   │   │       ├── [-rw-r--r--  3.9K]  point_const_iterator.hpp
+    │           │   │   │       └── [-rw-r--r--  3.7K]  point_iterator.hpp
+    │           │   │   ├── [-rw-r--r--  2.9K]  exception.hpp
+    │           │   │   ├── [-rw-r--r--   16K]  hash_policy.hpp
+    │           │   │   ├── [-rw-r--r--  4.2K]  list_update_policy.hpp
+    │           │   │   ├── [-rw-r--r--  5.3K]  priority_queue.hpp
+    │           │   │   ├── [-rw-r--r--   12K]  tag_and_trait.hpp
+    │           │   │   ├── [-rw-r--r--  5.4K]  tree_policy.hpp
+    │           │   │   └── [-rw-r--r--   12K]  trie_policy.hpp
+    │           │   ├── [-rw-r--r--  5.5K]  pod_char_traits.h
+    │           │   ├── [-rw-r--r--   20K]  pointer.h
+    │           │   ├── [-rw-r--r--  8.8K]  pool_allocator.h
+    │           │   ├── [-rw-r--r--  112K]  random
+    │           │   ├── [-rw-r--r--   59K]  random.tcc
+    │           │   ├── [-rw-r--r--  3.3K]  rb_tree
+    │           │   ├── [-rw-r--r--   23K]  rc_string_base.h
+    │           │   ├── [-rw-r--r--   88K]  rope
+    │           │   ├── [-rw-r--r--   48K]  ropeimpl.h
+    │           │   ├── [-rw-r--r--   29K]  slist
+    │           │   ├── [-rw-r--r--   16K]  sso_string_base.h
+    │           │   ├── [-rw-r--r--  5.6K]  stdio_filebuf.h
+    │           │   ├── [-rw-r--r--  8.6K]  stdio_sync_filebuf.h
+    │           │   ├── [-rw-r--r--  3.6K]  string_conversions.h
+    │           │   ├── [-rw-r--r--   25K]  throw_allocator.h
+    │           │   ├── [-rw-r--r--  7.1K]  type_traits.h
+    │           │   ├── [-rw-r--r--   16K]  typelist.h
+    │           │   ├── [-rw-r--r--  108K]  vstring.h
+    │           │   ├── [-rw-r--r--   23K]  vstring.tcc
+    │           │   ├── [-rw-r--r--  3.1K]  vstring_fwd.h
+    │           │   └── [-rw-r--r--  5.8K]  vstring_util.h
+    │           ├── [-rw-r--r--  2.0K]  fenv.h
+    │           ├── [-rw-r--r--  1.7K]  filesystem
+    │           ├── [-rw-r--r--  111K]  format
+    │           ├── [-rw-r--r--  2.7K]  forward_list
+    │           ├── [-rw-r--r--   40K]  fstream
+    │           ├── [-rw-r--r--   45K]  functional
+    │           ├── [-rw-r--r--   52K]  future
+    │           ├── [-rw-r--r--  2.9K]  initializer_list
+    │           ├── [-rw-r--r--   16K]  iomanip
+    │           ├── [-rw-r--r--  1.6K]  ios
+    │           ├── [-rw-r--r--  8.2K]  iosfwd
+    │           ├── [-rw-r--r--  3.0K]  iostream
+    │           ├── [-rw-r--r--   35K]  istream
+    │           ├── [-rw-r--r--  2.8K]  iterator
+    │           ├── [-rw-r--r--  2.7K]  latch
+    │           ├── [-rw-r--r--   76K]  limits
+    │           ├── [-rw-r--r--  3.6K]  list
+    │           ├── [-rw-r--r--  1.5K]  locale
+    │           ├── [-rw-r--r--  4.0K]  map
+    │           ├── [-rw-r--r--  4.5K]  math.h
+    │           ├── [-rw-r--r--  4.8K]  memory
+    │           ├── [-rw-r--r--   14K]  memory_resource
+    │           ├── [-rw-r--r--   27K]  mutex
+    │           ├── [-rw-r--r--  8.4K]  new
+    │           ├── [-rw-r--r--  6.8K]  numbers
+    │           ├── [-rw-r--r--   25K]  numeric
+    │           ├── [-rw-r--r--   43K]  optional
+    │           ├── [-rw-r--r--   27K]  ostream
+    │           ├── [drwxr-xr-x    45]  parallel
+    │           │   ├── [-rw-r--r--   79K]  algo.h
+    │           │   ├── [-rw-r--r--   18K]  algobase.h
+    │           │   ├── [-rw-r--r--  1.3K]  algorithm
+    │           │   ├── [-rw-r--r--   32K]  algorithmfwd.h
+    │           │   ├── [-rw-r--r--   17K]  balanced_quicksort.h
+    │           │   ├── [-rw-r--r--   12K]  base.h
+    │           │   ├── [-rw-r--r--  1.5K]  basic_iterator.h
+    │           │   ├── [-rw-r--r--  2.2K]  checkers.h
+    │           │   ├── [-rw-r--r--  3.7K]  compatibility.h
+    │           │   ├── [-rw-r--r--  2.8K]  compiletime_settings.h
+    │           │   ├── [-rw-r--r--  3.3K]  equally_split.h
+    │           │   ├── [-rw-r--r--  3.5K]  features.h
+    │           │   ├── [-rw-r--r--   13K]  find.h
+    │           │   ├── [-rw-r--r--  6.8K]  find_selectors.h
+    │           │   ├── [-rw-r--r--  3.9K]  for_each.h
+    │           │   ├── [-rw-r--r--   10K]  for_each_selectors.h
+    │           │   ├── [-rw-r--r--  5.5K]  iterator.h
+    │           │   ├── [-rw-r--r--  6.4K]  list_partition.h
+    │           │   ├── [-rw-r--r--   28K]  losertree.h
+    │           │   ├── [-rw-r--r--  9.4K]  merge.h
+    │           │   ├── [-rw-r--r--   22K]  multiseq_selection.h
+    │           │   ├── [-rw-r--r--   69K]  multiway_merge.h
+    │           │   ├── [-rw-r--r--   15K]  multiway_mergesort.h
+    │           │   ├── [-rw-r--r--   20K]  numeric
+    │           │   ├── [-rw-r--r--  7.3K]  numericfwd.h
+    │           │   ├── [-rw-r--r--  3.9K]  omp_loop.h
+    │           │   ├── [-rw-r--r--  4.0K]  omp_loop_static.h
+    │           │   ├── [-rw-r--r--  4.4K]  par_loop.h
+    │           │��  ├── [-rw-r--r--  1.5K]  parallel.h
+    │           │   ├── [-rw-r--r--  7.3K]  partial_sum.h
+    │           │   ├── [-rw-r--r--   15K]  partition.h
+    │           │   ├── [-rw-r--r--  5.4K]  queue.h
+    │           │   ├── [-rw-r--r--  6.0K]  quicksort.h
+    │           │   ├── [-rw-r--r--  4.1K]  random_number.h
+    │           │   ├── [-rw-r--r--   18K]  random_shuffle.h
+    │           │   ├── [-rw-r--r--  5.3K]  search.h
+    │           │   ├── [-rw-r--r--   14K]  set_operations.h
+    │           │   ├── [-rw-r--r--   12K]  settings.h
+    │           │   ├── [-rw-r--r--  7.5K]  sort.h
+    │           │   ├── [-rw-r--r--  5.8K]  tags.h
+    │           │   ├── [-rw-r--r--  3.6K]  types.h
+    │           │   ├── [-rw-r--r--  6.0K]  unique_copy.h
+    │           │   └── [-rw-r--r--  9.4K]  workstealing.h
+    │           ├── [drwxr-xr-x    24]  pstl
+    │           │   ├── [-rw-r--r--   67K]  algorithm_fwd.h
+    │           │   ├── [-rw-r--r--  170K]  algorithm_impl.h
+    │           │   ├── [-rw-r--r--  3.7K]  execution_defs.h
+    │           │   ├── [-rw-r--r--  4.7K]  execution_impl.h
+    │           │   ├── [-rw-r--r--   32K]  glue_algorithm_defs.h
+    │           │   ├── [-rw-r--r--   63K]  glue_algorithm_impl.h
+    │           │   ├── [-rw-r--r--  1.5K]  glue_execution_defs.h
+    │           │   ├── [-rw-r--r--  3.8K]  glue_memory_defs.h
+    │           │   ├── [-rw-r--r--   19K]  glue_memory_impl.h
+    │           │   ├── [-rw-r--r--  6.5K]  glue_numeric_defs.h
+    │           │   ├── [-rw-r--r--   12K]  glue_numeric_impl.h
+    │           │   ├── [-rw-r--r--  4.0K]  memory_impl.h
+    │           │   ├── [-rw-r--r--  7.7K]  numeric_fwd.h
+    │           │   ├── [-rw-r--r--   18K]  numeric_impl.h
+    │           │   ├── [-rw-r--r--   845]  parallel_backend.h
+    │           │   ├── [-rw-r--r--  3.9K]  parallel_backend_serial.h
+    │           │   ├── [-rw-r--r--   43K]  parallel_backend_tbb.h
+    │           │   ├── [-rw-r--r--  8.9K]  parallel_backend_utils.h
+    │           │   ├── [-rw-r--r--  4.0K]  parallel_impl.h
+    │           │   ├── [-rw-r--r--  7.2K]  pstl_config.h
+    │           │   ├── [-rw-r--r--   29K]  unseq_backend_simd.h
+    │           │   └── [-rw-r--r--  4.5K]  utils.h
+    │           ├── [-rw-r--r--  2.5K]  queue
+    │           ├── [-rw-r--r--  1.7K]  random
+    │           ├── [-rw-r--r--  254K]  ranges
+    │           ├── [-rw-r--r--   20K]  ratio
+    │           ├── [-rw-r--r--  3.1K]  regex
+    │           ├── [-rw-r--r--   17K]  scoped_allocator
+    │           ├── [-rw-r--r--  3.0K]  semaphore
+    │           ├── [-rw-r--r--  3.9K]  set
+    │           ├── [-rw-r--r--   25K]  shared_mutex
+    │           ├── [-rw-r--r--  2.7K]  source_location
+    │           ├── [-rw-r--r--   13K]  span
+    │           ├── [-rw-r--r--   12K]  spanstream
+    │           ├── [-rw-r--r--   39K]  sstream
+    │           ├── [-rw-r--r--  2.4K]  stack
+    │           ├── [-rw-r--r--   21K]  stacktrace
+    │           ├── [-rw-r--r--  4.0K]  stdatomic.h
+    │           ├── [-rw-r--r--  9.6K]  stdexcept
+    │           ├── [-rw-r--r--  1.7K]  stdfloat
+    │           ├── [-rw-r--r--  2.3K]  stdlib.h
+    │           ├── [-rw-r--r--   16K]  stop_token
+    │           ├── [-rw-r--r--   29K]  streambuf
+    │           ├── [-rw-r--r--  3.9K]  string
+    │           ├── [-rw-r--r--   27K]  string_view
+    │           ├── [-rw-r--r--  8.2K]  syncstream
+    │           ├── [-rw-r--r--   18K]  system_error
+    │           ├── [-rw-r--r--  1.3K]  tgmath.h
+    │           ├── [-rw-r--r--  7.3K]  thread
+    │           ├── [drwxr-xr-x    64]  tr1
+    │           │   ├── [-rw-r--r--  6.9K]  array
+    │           │   ├── [-rw-r--r--   22K]  bessel_function.tcc
+    │           │   ├── [-rw-r--r--  5.9K]  beta_function.tcc
+    │           │   ├── [-rw-r--r--  1.3K]  ccomplex
+    │           │   ├── [-rw-r--r--  1.5K]  cctype
+    │           │   ├── [-rw-r--r--  2.1K]  cfenv
+    │           │   ├── [-rw-r--r--  1.4K]  cfloat
+    │           │   ├── [-rw-r--r--  2.3K]  cinttypes
+    │           │   ├── [-rw-r--r--  1.5K]  climits
+    │           │   ├── [-rw-r--r--   43K]  cmath
+    │           │   ├── [-rw-r--r--   12K]  complex
+    │           │   ├── [-rw-r--r--  1.3K]  complex.h
+    │           │   ├── [-rw-r--r--  1.3K]  cstdarg
+    │           │   ├── [-rw-r--r--  1.4K]  cstdbool
+    │           │   ├── [-rw-r--r--  2.7K]  cstdint
+    │           │   ├── [-rw-r--r--  1.6K]  cstdio
+    │           │   ├── [-rw-r--r--  1.9K]  cstdlib
+    │           │   ├── [-rw-r--r--  1.3K]  ctgmath
+    │           │   ├── [-rw-r--r--  1.2K]  ctime
+    │           │   ├── [-rw-r--r--  1.2K]  ctype.h
+    │           │   ├── [-rw-r--r--  1.8K]  cwchar
+    │           │   ├── [-rw-r--r--  1.5K]  cwctype
+    │           │   ├── [-rw-r--r--   26K]  ell_integral.tcc
+    │           │   ├── [-rw-r--r--   16K]  exp_integral.tcc
+    │           │   ├── [-rw-r--r--  1.2K]  fenv.h
+    │           │   ├── [-rw-r--r--  1.2K]  float.h
+    │           │   ├── [-rw-r--r--   69K]  functional
+    │           │   ├── [-rw-r--r--  6.1K]  functional_hash.h
+    │           │   ├── [-rw-r--r--   14K]  gamma.tcc
+    │           │   ├── [-rw-r--r--   41K]  hashtable.h
+    │           │   ├── [-rw-r--r--   24K]  hashtable_policy.h
+    │           │   ├── [-rw-r--r--   27K]  hypergeometric.tcc
+    │           │   ├── [-rw-r--r--  1.3K]  inttypes.h
+    │           │   ├── [-rw-r--r--   10K]  legendre_function.tcc
+    │           │   ├── [-rw-r--r--  1.2K]  limits.h
+    │           │   ├── [-rw-r--r--  4.5K]  math.h
+    │           │   ├── [-rw-r--r--  1.8K]  memory
+    │           │   ├── [-rw-r--r--   16K]  modified_bessel_func.tcc
+    │           │   ├── [-rw-r--r--  3.8K]  poly_hermite.tcc
+    │           │   ├── [-rw-r--r--   11K]  poly_laguerre.tcc
+    │           │   ├── [-rw-r--r--  1.6K]  random
+    │           │   ├── [-rw-r--r--   70K]  random.h
+    │           │   ├── [-rw-r--r--   53K]  random.tcc
+    │           │   ├── [-rw-r--r--   91K]  regex
+    │           │   ├── [-rw-r--r--   14K]  riemann_zeta.tcc
+    │           │   ├── [-rw-r--r--   32K]  shared_ptr.h
+    │           │   ├── [-rw-r--r--  4.9K]  special_function_util.h
+    │           │   ├── [-rw-r--r--  1.2K]  stdarg.h
+    │           │   ├── [-rw-r--r--  1.2K]  stdbool.h
+    │           │   ├── [-rw-r--r--  1.2K]  stdint.h
+    │           │   ├── [-rw-r--r--  1.2K]  stdio.h
+    │           │   ├── [-rw-r--r--  1.5K]  stdlib.h
+    │           │   ├── [-rw-r--r--  1.3K]  tgmath.h
+    │           │   ├── [-rw-r--r--   12K]  tuple
+    │           │   ├── [-rw-r--r--   19K]  type_traits
+    │           │   ├── [-rw-r--r--  1.6K]  unordered_map
+    │           │   ├── [-rw-r--r-- 10.0K]  unordered_map.h
+    │           │   ├── [-rw-r--r--  1.6K]  unordered_set
+    │           │   ├── [-rw-r--r--  9.3K]  unordered_set.h
+    │           │   ├── [-rw-r--r--  3.2K]  utility
+    │           │   ├── [-rw-r--r--  1.3K]  wchar.h
+    │           │   └── [-rw-r--r--  1.3K]  wctype.h
+    │           ├── [drwxr-xr-x     8]  tr2
+    │           │   ├── [-rw-r--r--  7.2K]  bool_set
+    │           │   ├── [-rw-r--r--  8.1K]  bool_set.tcc
+    │           │   ├── [-rw-r--r--   34K]  dynamic_bitset
+    │           │   ├── [-rw-r--r--  8.7K]  dynamic_bitset.tcc
+    │           │   ├── [-rw-r--r--  2.1K]  ratio
+    │           │   └── [-rw-r--r--  2.6K]  type_traits
+    │           ├── [-rw-r--r--   76K]  tuple
+    │           ├── [-rw-r--r--  112K]  type_traits
+    │           ├── [-rw-r--r--  3.4K]  typeindex
+    │           ├── [-rw-r--r--  8.1K]  typeinfo
+    │           ├── [-rw-r--r--  3.4K]  unordered_map
+    │           ├── [-rw-r--r--  3.2K]  unordered_set
+    │           ├── [-rw-r--r--  7.0K]  utility
+    │           ├── [-rw-r--r--   40K]  valarray
+    │           ├── [-rw-r--r--   64K]  variant
+    │           ├── [-rw-r--r--  4.7K]  vector
+    │           ├── [-rw-r--r--   12K]  version
+    │           └── [drwxr-xr-x     4]  x86_64-linux-gnu
+    │               ├── [drwxr-xr-x    24]  bits
+    │               │   ├── [-rw-r--r--  1.5K]  atomic_word.h
+    │               │   ├── [-rw-r--r--  3.5K]  basic_file.h
+    │               │   ├── [-rw-r--r--  2.0K]  c++allocator.h
+    │               │   ├── [-rw-r--r--   67K]  c++config.h
+    │               │   ├── [-rw-r--r--  1.9K]  c++io.h
+    │               │   ├── [-rw-r--r--  3.5K]  c++locale.h
+    │               │   ├── [-rw-r--r--  1.3K]  cpu_defines.h
+    │               │   ├── [-rw-r--r--  2.3K]  ctype_base.h
+    │               │   ├── [-rw-r--r--  2.2K]  ctype_inline.h
+    │               │   ├── [-rw-r--r--  2.0K]  cxxabi_tweaks.h
+    │               │   ├── [-rw-r--r--  4.9K]  error_constants.h
+    │               │   ├── [-rw-r--r--  2.6K]  extc++.h
+    │               │   ├── [-rw-r--r--   24K]  gthr-default.h
+    │               │   ├── [-rw-r--r--   24K]  gthr-posix.h
+    │               │   ├── [-rw-r--r--  6.6K]  gthr-single.h
+    │               │   ├── [-rw-r--r--  5.5K]  gthr.h
+    │               │   ├── [-rw-r--r--  4.4K]  messages_members.h
+    │               │   ├── [-rw-r--r--  6.0K]  opt_random.h
+    │               │   ├── [-rw-r--r--  3.2K]  os_defines.h
+    │               │   ├── [-rw-r--r--  4.6K]  stdc++.h
+    │               │   ├── [-rw-r--r--  1.7K]  stdtr1c++.h
+    │               │   └── [-rw-r--r--  2.9K]  time_members.h
+    │               └── [drwxr-xr-x     3]  ext
+    │                   └── [-rw-r--r--  4.6K]  opt_random.h
+    ├── [drwxr-xr-x    80]  lib64
+    │   ├── [drwxr-xr-x     3]  gcc
+    │   │   └── [drwxr-xr-x     3]  x86_64-linux-gnu
+    │   │       └── [drwxr-xr-x    18]  13.2.0
+    │   │           ├── [-rw-r--r--  2.4K]  crtbegin.o
+    │   │           ├── [-rw-r--r--  2.7K]  crtbeginS.o
+    │   │           ├── [-rw-r--r--  2.9K]  crtbeginT.o
+    │   │           ├── [-rw-r--r--  1.2K]  crtend.o
+    │   │           ├── [-rw-r--r--  1.2K]  crtendS.o
+    │   │           ├── [-rw-r--r--  3.7K]  crtfastmath.o
+    │   │           ├── [-rw-r--r--  3.4K]  crtprec32.o
+    │   │           ├── [-rw-r--r--  3.4K]  crtprec64.o
+    │   │           ├── [-rw-r--r--  3.4K]  crtprec80.o
+    │   │           ├── [drwxr-xr-x   129]  include
+    │   │           │   ├── [-rw-r--r--  7.3K]  acc_prof.h
+    │   │           │   ├── [-rw-r--r--  2.8K]  adxintrin.h
+    │   │           │   ├── [-rw-r--r--  3.1K]  ammintrin.h
+    │   │           │   ├── [-rw-r--r--  1.8K]  amxbf16intrin.h
+    │   │           │   ├── [-rw-r--r--  2.1K]  amxcomplexintrin.h
+    │   │           │   ├── [-rw-r--r--  1.6K]  amxfp16intrin.h
+    │   │           │   ├── [-rw-r--r--  2.0K]  amxint8intrin.h
+    │   │           │   ├── [-rw-r--r--  3.1K]  amxtileintrin.h
+    │   │           │   ├── [-rw-r--r--   57K]  avx2intrin.h
+    │   │           │   ├── [-rw-r--r--  6.4K]  avx5124fmapsintrin.h
+    │   │           │   ├── [-rw-r--r--  4.2K]  avx5124vnniwintrin.h
+    │   │           │   ├── [-rw-r--r--  4.9K]  avx512bf16intrin.h
+    │   │           │   ├── [-rw-r--r--  7.8K]  avx512bf16vlintrin.h
+    │   │           │   ├── [-rw-r--r--  8.6K]  avx512bitalgintrin.h
+    │   │           │   ├── [-rw-r--r--  100K]  avx512bwintrin.h
+    │   │           │   ├── [-rw-r--r--  5.7K]  avx512cdintrin.h
+    │   │           │   ├── [-rw-r--r--   91K]  avx512dqintrin.h
+    │   │           │   ├── [-rw-r--r--   17K]  avx512erintrin.h
+    │   │           │   ├── [-rw-r--r--  514K]  avx512fintrin.h
+    │   │           │   ├── [-rw-r--r--  210K]  avx512fp16intrin.h
+    │   │           │   ├── [-rw-r--r--   94K]  avx512fp16vlintrin.h
+    │   │           │   ├── [-rw-r--r--  3.3K]  avx512ifmaintrin.h
+    │   │           │   ├── [-rw-r--r--  4.7K]  avx512ifmavlintrin.h
+    │   │           │   ├── [-rw-r--r--   10K]  avx512pfintrin.h
+    │   │           │   ├── [-rw-r--r--   19K]  avx512vbmi2intrin.h
+    │   │           │   ├── [-rw-r--r--   36K]  avx512vbmi2vlintrin.h
+    │   │           │   ├── [-rw-r--r--  4.8K]  avx512vbmiintrin.h
+    │   │           │   ├── [-rw-r--r--  8.2K]  avx512vbmivlintrin.h
+    │   │           │   ├── [-rw-r--r--  142K]  avx512vlbwintrin.h
+    │   │           │   ├── [-rw-r--r--   60K]  avx512vldqintrin.h
+    │   │           │   ├── [-rw-r--r--  420K]  avx512vlintrin.h
+    │   │           │   ├── [-rw-r--r--  4.9K]  avx512vnniintrin.h
+    │   │           │   ├── [-rw-r--r--  7.2K]  avx512vnnivlintrin.h
+    │   │           │   ├── [-rw-r--r--  2.1K]  avx512vp2intersectintrin.h
+    │   │           │   ├── [-rw-r--r--  2.6K]  avx512vp2intersectvlintrin.h
+    │   │           │   ├── [-rw-r--r--  3.0K]  avx512vpopcntdqintrin.h
+    │   │           │   ├── [-rw-r--r--  4.6K]  avx512vpopcntdqvlintrin.h
+    │   │           │   ├── [-rw-r--r--  2.5K]  avxifmaintrin.h
+    │   │           │   ├── [-rw-r--r--   52K]  avxintrin.h
+    │   │           │   ├── [-rw-r--r--  4.3K]  avxneconvertintrin.h
+    │   │           │   ├── [-rw-r--r--  4.4K]  avxvnniint8intrin.h
+    │   │           │   ├── [-rw-r--r--  3.5K]  avxvnniintrin.h
+    │   │           │   ├── [-rw-r--r--  3.3K]  bmi2intrin.h
+    │   │           │   ├── [-rw-r--r--  6.0K]  bmiintrin.h
+    │   │           │   ├── [-rw-r--r--  1.1K]  bmmintrin.h
+    │   │           │   ├── [-rw-r--r--  2.6K]  cet.h
+    │   │           │   ├── [-rw-r--r--  3.3K]  cetintrin.h
+    │   │           │   ├── [-rw-r--r--  1.6K]  cldemoteintrin.h
+    │   │           │   ├── [-rw-r--r--  1.6K]  clflushoptintrin.h
+    │   │           │   ├── [-rw-r--r--  1.5K]  clwbintrin.h
+    │   │           │   ├── [-rw-r--r--  1.5K]  clzerointrin.h
+    │   │           │   ├── [-rw-r--r--  2.8K]  cmpccxaddintrin.h
+    │   │           │   ├── [-rw-r--r--  9.9K]  cpuid.h
+    │   │           │   ├── [-rw-r--r--  2.5K]  cross-stdarg.h
+    │   │           │   ├── [-rw-r--r--   51K]  emmintrin.h
+    │   │           │   ├── [-rw-r--r--  1.8K]  enqcmdintrin.h
+    │   │           │   ├── [-rw-r--r--  3.3K]  f16cintrin.h
+    │   │           │   ├── [-rw-r--r--   20K]  float.h
+    │   │           │   ├── [-rw-r--r--  8.9K]  fma4intrin.h
+    │   │           │   ├── [-rw-r--r--  9.9K]  fmaintrin.h
+    │   │           │   ├── [-rw-r--r--  2.0K]  fxsrintrin.h
+    │   │           │   ├── [-rw-r--r--  2.9K]  gcov.h
+    │   │           │   ├── [-rw-r--r--   15K]  gfniintrin.h
+    │   │           │   ├── [-rw-r--r--  1.6K]  hresetintrin.h
+    │   │           │   ├── [-rw-r--r--  7.7K]  ia32intrin.h
+    │   │           │   ├── [-rw-r--r--  2.7K]  immintrin.h
+    │   │           │   ├── [-rw-r--r--  1.2K]  iso646.h
+    │   │           │   ├── [-rw-r--r--  4.3K]  keylockerintrin.h
+    │   │           │   ├── [-rw-r--r--  6.2K]  limits.h
+    │   │           │   ├── [-rw-r--r--  3.3K]  lwpintrin.h
+    │   │           │   ├── [-rw-r--r--  2.3K]  lzcntintrin.h
+    │   │           │   ├── [-rw-r--r--  6.9K]  mm3dnow.h
+    │   │           │   ├── [-rw-r--r--  1.7K]  mm_malloc.h
+    │   │           │   ├── [-rw-r--r--   31K]  mmintrin.h
+    │   │           │   ├── [-rw-r--r--  2.3K]  movdirintrin.h
+    │   │           │   ├── [-rw-r--r--  1.7K]  mwaitintrin.h
+    │   │           │   ├── [-rw-r--r--  1.7K]  mwaitxintrin.h
+    │   │           │   ├── [-rw-r--r--  1.3K]  nmmintrin.h
+    │   │           │   ├── [-rw-r--r--   12K]  omp.h
+    │   │           │   ├── [-rw-r--r--  6.3K]  openacc.h
+    │   │           │   ├── [-rw-r--r--  2.3K]  pconfigintrin.h
+    │   │           │   ├── [-rw-r--r--  1.7K]  pkuintrin.h
+    │   │           │   ├── [-rw-r--r--  3.9K]  pmmintrin.h
+    │   │           │   ├── [-rw-r--r--  1.7K]  popcntintrin.h
+    │   │           │   ├── [-rw-r--r--  1.8K]  prfchiintrin.h
+    │   │           │   ├── [-rw-r--r--  1.4K]  prfchwintrin.h
+    │   │           │   ├── [-rw-r--r--  9.1K]  quadmath.h
+    │   │           │   ├── [-rw-r--r--  3.1K]  quadmath_weak.h
+    │   │           │   ├── [-rw-r--r--  2.9K]  raointintrin.h
+    │   │           │   ├── [-rw-r--r--  2.0K]  rdseedintrin.h
+    │   │           │   ├── [-rw-r--r--  2.7K]  rtmintrin.h
+    │   │           │   ├── [drwxr-xr-x     7]  sanitizer
+    │   │           │   │   ├── [-rw-r--r--   12K]  asan_interface.h
+    │   │           │   │   ├── [-rw-r--r--   16K]  common_interface_defs.h
+    │   │           │   │   ├── [-rw-r--r--  4.2K]  hwasan_interface.h
+    │   │           │   │   ├── [-rw-r--r--  3.8K]  lsan_interface.h
+    │   │           │   │   └── [-rw-r--r--  7.6K]  tsan_interface.h
+    │   │           │   ├── [-rw-r--r--  1.6K]  serializeintrin.h
+    │   │           │   ├── [-rw-r--r--  6.9K]  sgxintrin.h
+    │   │           │   ├── [-rw-r--r--  3.1K]  shaintrin.h
+    │   │           │   ├── [-rw-r--r--   28K]  smmintrin.h
+    │   │           │   ├── [drwxr-xr-x     6]  ssp
+    │   │           │   │   ├── [-rw-r--r--  2.3K]  ssp.h
+    │   │           │   │   ├── [-rw-r--r--  3.4K]  stdio.h
+    │   │           │   │   ├── [-rw-r--r--  5.6K]  string.h
+    │   │           │   │   └── [-rw-r--r--  2.7K]  unistd.h
+    │   │           │   ├── [-rw-r--r--  1.3K]  stdalign.h
+    │   │           │   ├── [-rw-r--r--  4.2K]  stdarg.h
+    │   │           │   ├── [-rw-r--r--  9.5K]  stdatomic.h
+    │   │           │   ├── [-rw-r--r--  1.5K]  stdbool.h
+    │   │           │   ├── [-rw-r--r--   13K]  stddef.h
+    │   │           │   ├── [-rw-r--r--  5.9K]  stdfix.h
+    │   │           │   ├── [-rw-r--r--  9.4K]  stdint-gcc.h
+    │   │           │   ├── [-rw-r--r--   328]  stdint.h
+    │   │           │   ├── [-rw-r--r--  1.1K]  stdnoreturn.h
+    │   │           │   ├── [-rw-r--r--   330]  syslimits.h
+    │   │           │   ├── [-rw-r--r--  5.1K]  tbmintrin.h
+    │   │           │   ├── [-rw-r--r--  8.1K]  tmmintrin.h
+    │   │           │   ├── [-rw-r--r--  1.7K]  tsxldtrkintrin.h
+    │   │           │   ├── [-rw-r--r--  2.3K]  uintrintrin.h
+    │   │           │   ├── [-rw-r--r--   11K]  unwind.h
+    │   │           │   ├── [-rw-r--r--  3.4K]  vaesintrin.h
+    │   │           │   ├── [-rw-r--r--   139]  varargs.h
+    │   │           │   ├── [-rw-r--r--  2.7K]  vpclmulqdqintrin.h
+    │   │           │   ├── [-rw-r--r--  2.0K]  waitpkgintrin.h
+    │   │           │   ├── [-rw-r--r--  1.6K]  wbnoinvdintrin.h
+    │   │           │   ├── [-rw-r--r--  4.5K]  wmmintrin.h
+    │   │           │   ├── [-rw-r--r--  6.0K]  x86gprintrin.h
+    │   │           │   ├── [-rw-r--r--  1.3K]  x86intrin.h
+    │   │           │   ├── [-rw-r--r--   44K]  xmmintrin.h
+    │   │           │   ├── [-rw-r--r--   28K]  xopintrin.h
+    │   │           │   ├── [-rw-r--r--  1.8K]  xsavecintrin.h
+    │   │           │   ├── [-rw-r--r--  2.4K]  xsaveintrin.h
+    │   │           │   ├── [-rw-r--r--  1.8K]  xsaveoptintrin.h
+    │   │           │   ├── [-rw-r--r--  2.1K]  xsavesintrin.h
+    │   │           │   └── [-rw-r--r--  1.7K]  xtestintrin.h
+    │   │           ├── [drwxr-xr-x     6]  include-fixed
+    │   │           │   ├── [-rw-r--r--   750]  README
+    │   │           │   ├── [drwxr-xr-x     3]  c++
+    │   │           │   │   └── [drwxr-xr-x     2]  13
+    │   │           │   ├── [drwxr-xr-x     2]  linux-default
+    │   │           │   └── [-rw-r--r--   47K]  pthread.h
+    │   │           ├── [drwxr-xr-x     7]  install-tools
+    │   │           │   ├── [-rw-r--r--     2]  fixinc_list
+    │   │           │   ├── [-rw-r--r--   330]  gsyslimits.h
+    │   │           │   ├── [drwxr-xr-x     4]  include
+    │   │           │   │   ├── [-rw-r--r--   750]  README
+    │   │           │   │   └── [-rw-r--r--  6.2K]  limits.h
+    │   │           │   ├── [-rw-r--r--    11]  macro_list
+    │   │           │   └── [-rw-r--r--    85]  mkheaders.conf
+    │   │           ├── [-rw-r--r--  5.6M]  libgcc.a
+    │   │           ├── [-rw-r--r--  316K]  libgcc_eh.a
+    │   │           ├── [-rw-r--r--  283K]  libgcov.a
+    │   │           └── [drwxr-xr-x    12]  plugin
+    │   │               ├── [-rw-r--r--  1.3M]  gtype.state
+    │   │               ├── [drwxr-xr-x   441]  include
+    │   │               │   ├── [drwxr-xr-x     3]  ada
+    │   │               │   │   └── [drwxr-xr-x     3]  gcc-interface
+    │   │               │   │       └── [-rw-r--r--  4.9K]  ada-tree.def
+    │   │               │   ├── [-rw-r--r--  2.9K]  addresses.h
+    │   │               │   ├── [-rw-r--r--  2.1K]  alias.h
+    │   │               │   ├── [-rw-r--r--  2.4K]  align.h
+    │   │               │   ├── [-rw-r--r--   224]  all-tree.def
+    │   │               │   ├── [-rw-r--r--   15K]  alloc-pool.h
+    │   │               │   ├── [-rw-r--r--   12K]  ansidecl.h
+    │   │               │   ├── [-rw-r--r--  1.5K]  array-traits.h
+    │   │               │   ├── [-rw-r--r--  8.6K]  asan.h
+    │   │               │   ├── [-rw-r--r--  8.5K]  attr-fnspec.h
+    │   │               │   ├── [-rw-r--r--   14K]  attribs.h
+    │   │               │   ├── [-rw-r--r--   58K]  auto-host.h
+    │   │               │   ├── [-rw-r--r--  1.1K]  auto-profile.h
+    │   │               │   ├── [-rw-r--r--   40K]  b-header-vars
+    │   │               │   ├── [-rw-r--r--  1.0K]  backend.h
+    │   │               │   ├── [-rw-r--r--   18K]  basic-block.h
+    │   │               │   ├── [-rw-r--r--  1.2K]  bb-reorder.h
+    │   │               │   ├── [-rw-r--r--   37K]  bitmap.h
+    │   │               │   ├── [-rw-r--r--   20K]  builtin-attrs.def
+    │   │               │   ├── [-rw-r--r--   52K]  builtin-types.def
+    │   │               │   ├── [-rw-r--r--   94K]  builtins.def
+    │   │               │   ├── [-rw-r--r--  7.0K]  builtins.h
+    │   │               │   ├── [-rw-r--r--   171]  bversion.h
+    │   │               │   ├── [drwxr-xr-x     7]  c-family
+    │   │               │   │   ├── [-rw-r--r--  4.1K]  c-common.def
+    │   │               │   │   ├── [-rw-r--r--   58K]  c-common.h
+    │   │               │   │   ├── [-rw-r--r--  7.8K]  c-objc.h
+    │   │               │   │   ├── [-rw-r--r--  9.3K]  c-pragma.h
+    │   │               │   │   └── [-rw-r--r--  5.2K]  c-pretty-print.h
+    │   │               │   ├── [-rw-r--r--   34K]  c-tree.h
+    │   │               │   ├── [-rw-r--r--  5.2K]  calls.h
+    │   │               │   ├── [-rw-r--r--   845]  ccmp.h
+    │   │               │   ├── [-rw-r--r--  6.7K]  cfg-flags.def
+    │   │               │   ├── [-rw-r--r--  6.3K]  cfg.h
+    │   │               │   ├── [-rw-r--r--  3.4K]  cfganal.h
+    │   │               │   ├── [-rw-r--r--  1016]  cfgbuild.h
+    │   │               │   ├── [-rw-r--r--  1.3K]  cfgcleanup.h
+    │   │               │   ├── [-rw-r--r--   966]  cfgexpand.h
+    │   │               │   ├── [-rw-r--r--   11K]  cfghooks.h
+    │   │               │   ├── [-rw-r--r--   27K]  cfgloop.h
+    │   │ ��             │   ├── [-rw-r--r--  2.4K]  cfgloopmanip.h
+    │   │               │   ├── [-rw-r--r--  2.6K]  cfgrtl.h
+    │   │               │   ├── [-rw-r--r--  121K]  cgraph.h
+    │   │               │   ├── [-rw-r--r--  5.5K]  cif-code.def
+    │   │               │   ├── [-rw-r--r--  1.7K]  collect-utils.h
+    │   │               │   ├── [-rw-r--r--  8.4K]  collect2-aix.h
+    │   │               │   ├── [-rw-r--r--  1.3K]  collect2.h
+    │   │               │   ├── [-rw-r--r--  4.8K]  color-macros.h
+    │   │               │   ├── [drwxr-xr-x     3]  common
+    │   │               │   │   └── [drwxr-xr-x     3]  config
+    │   │               │   │       └── [drwxr-xr-x     3]  i386
+    │   │               │   │           └── [-rw-r--r--  5.9K]  i386-cpuinfo.h
+    │   │               │   ├── [-rw-r--r--  2.7K]  conditions.h
+    │   │               │   ├── [drwxr-xr-x    11]  config
+    │   │               │   │   ├── [-rw-r--r--   18K]  elfos.h
+    │   │               │   │   ├── [-rw-r--r--  2.8K]  glibc-stdint.h
+    │   │               │   │   ├── [-rw-r--r--  5.8K]  gnu-user.h
+    │   │               │   │   ├── [drwxr-xr-x    16]  i386
+    │   │               │   │   │   ├── [-rw-r--r--  3.1K]  att.h
+    │   │               │   │   │   ├── [-rw-r--r--  1.3K]  biarch64.h
+    │   │               │   │   │   ├── [-rw-r--r--  2.6K]  gnu-user-common.h
+    │   │               │   │   │   ├── [-rw-r--r--  3.2K]  gnu-user64.h
+    │   │               │   │   │   ├── [-rw-r--r--  2.3K]  i386-isa.def
+    │   │               │   │   │   ├── [-rw-r--r--  3.2K]  i386-opts.h
+    │   │               │   │   │   ├── [-rw-r--r--   17K]  i386-protos.h
+    │   │               │   │   │   ├── [-rw-r--r--  111K]  i386.h
+    │   │               │   │   │   ├── [-rw-r--r--  2.3K]  linux-common.h
+    │   │               │   │   │   ├── [-rw-r--r--  1.6K]  linux64.h
+    │   │               │   │   │   ├── [-rw-r--r--  1.0K]  stringop.def
+    │   │               │   │   │   ├── [-rw-r--r--  2.8K]  unix.h
+    │   │               │   │   │   ├── [-rw-r--r--  2.9K]  x86-64.h
+    │   │               │   │   │   └── [-rw-r--r--   33K]  x86-tune.def
+    │   │               │   │   ├── [-rw-r--r--  1.6K]  initfini-array.h
+    │   │               │   │   ├── [-rw-r--r--  1.9K]  linux-android.h
+    │   │               │   │   ├── [-rw-r--r--   811]  linux-protos.h
+    │   │               │   │   ├── [-rw-r--r--  8.3K]  linux.h
+    │   │               │   │   └── [-rw-r--r--  1.6K]  vxworks-dummy.h
+    │   │               │   ├── [-rw-r--r--   217]  config.h
+    │   │               │   ├── [-rw-r--r--   586]  configargs.h
+    │   │               │   ├── [-rw-r--r--  1.7K]  context.h
+    │   │               │   ├── [-rw-r--r--  1.8K]  convert.h
+    │   │               │   ├── [-rw-r--r--   15K]  coretypes.h
+    │   │               │   ├── [-rw-r--r--  1.9K]  coroutine-builtins.def
+    │   │               │   ├── [-rw-r--r--  2.3K]  coverage.h
+    │   │               │   ├── [drwxr-xr-x    10]  cp
+    │   │               │   │   ├── [-rw-r--r--  9.5K]  contracts.h
+    │   │               │   │   ├── [-rw-r--r--  4.8K]  cp-trait.def
+    │   │               │   │   ├── [-rw-r--r--   27K]  cp-tree.def
+    │   │               │   │   ├── [-rw-r--r--  342K]  cp-tree.h
+    │   │               │   │   ├── [-rw-r--r--  4.8K]  cxx-pretty-print.h
+    │   │               │   │   ├── [-rw-r--r--   18K]  name-lookup.h
+    │   │               │   │   ├── [-rw-r--r--  6.7K]  operators.def
+    │   │               │   │   └── [-rw-r--r--  1.8K]  type-utils.h
+    │   │               │   ├── [-rw-r--r--  1.1K]  cppbuiltin.h
+    │   │               │   ├── [-rw-r--r--  2.9K]  cppdefault.h
+    │   │               │   ├── [-rw-r--r--   56K]  cpplib.h
+    │   │               │   ├── [-rw-r--r--  4.5K]  cselib.h
+    │   │               │   ├── [-rw-r--r--   15K]  ctfc.h
+    │   │               │   ├── [drwxr-xr-x     3]  d
+    │   │               │   │   └── [-rw-r--r--  1.4K]  d-tree.def
+    │   │               │   ├── [-rw-r--r--   11K]  data-streamer.h
+    │   │               │   ├── [-rw-r--r--  6.5K]  dbgcnt.def
+    │   │               │   ├── [-rw-r--r--  1.2K]  dbgcnt.h
+    │   │               │   ├── [-rw-r--r--   877]  dce.h
+    │   │               │   ├── [-rw-r--r--  5.3K]  ddg.h
+    │   │               │   ├── [-rw-r--r--   11K]  debug.h
+    │   │               │   ├── [-rw-r--r--   41K]  defaults.h
+    │   │               │   ├── [-rw-r--r--   47K]  df.h
+    │   │               │   ├── [-rw-r--r--  2.3K]  dfp.h
+    │   │               │   ├── [-rw-r--r--  3.5K]  diagnostic-client-data-hooks.h
+    │   │               │   ├── [-rw-r--r--  2.2K]  diagnostic-color.h
+    │   │               │   ├── [-rw-r--r--  5.1K]  diagnostic-core.h
+    │   │               │   ├── [-rw-r--r--  2.0K]  diagnostic-event-id.h
+    │   │               │   ├── [-rw-r--r--  2.2K]  diagnostic-metadata.h
+    │   │               │   ├── [-rw-r--r--  6.7K]  diagnostic-path.h
+    │   │               │   ├── [-rw-r--r--  3.5K]  diagnostic-spec.h
+    │   │               │   ├── [-rw-r--r--  1.5K]  diagnostic-url.h
+    │   │               │   ├── [-rw-r--r--  2.6K]  diagnostic.def
+    │   │               │   ├── [-rw-r--r--   22K]  diagnostic.h
+    │   │               │   ├── [-rw-r--r--  6.6K]  digraph.h
+    │   │               │   ├── [-rw-r--r--  2.9K]  dojump.h
+    │   │               │   ├── [-rw-r--r--  3.6K]  dominance.h
+    │   │               │   ├── [-rw-r--r--  4.5K]  domwalk.h
+    │   │               │   ├── [-rw-r--r--   13K]  double-int.h
+    │   │               │   ├── [-rw-r--r--  9.1K]  dump-context.h
+    │   │               │   ├── [-rw-r--r--   23K]  dumpfile.h
+    │   │               │   ├── [-rw-r--r--  3.1K]  dwarf2asm.h
+    │   │               │   ├── [-rw-r--r--  1.9K]  dwarf2ctf.h
+    │   │               │   ├── [-rw-r--r--   16K]  dwarf2out.h
+    │   │               │   ├── [-rw-r--r--  2.1K]  edit-context.h
+    │   │               │   ├── [-rw-r--r--   20K]  emit-rtl.h
+    │   │               │   ├── [-rw-r--r--  1.6K]  errors.h
+    │   │               │   ├── [-rw-r--r--  1.3K]  escaped_string.h
+    │   │               │   ├── [-rw-r--r--  2.6K]  et-forest.h
+    │   │               │   ├── [-rw-r--r--   12K]  except.h
+    ���   │               │   ├── [-rw-r--r--  5.6K]  explow.h
+    │   │               │   ├── [-rw-r--r--   21K]  expmed.h
+    │   │               │   ├── [-rw-r--r--   13K]  expr.h
+    │   │               │   ├── [-rw-r--r--   16K]  fibonacci_heap.h
+    │   │               │   ├── [-rw-r--r--  1.7K]  file-find.h
+    │   │               │   ├── [-rw-r--r--  1.2K]  file-prefix-map.h
+    │   │               │   ├── [-rw-r--r--  3.4K]  filenames.h
+    │   │               │   ├── [-rw-r--r--  4.1K]  fixed-value.h
+    │   │               │   ├── [-rw-r--r--   15K]  flag-types.h
+    │   │               │   ├── [-rw-r--r--  3.5K]  flags.h
+    │   │               │   ├── [-rw-r--r--  1.0K]  fold-const-call.h
+    │   │               │   ├── [-rw-r--r--   13K]  fold-const.h
+    │   │               │   ├── [-rw-r--r--   11K]  function-abi.h
+    │   │               │   ├── [-rw-r--r--   26K]  function.h
+    │   │               │   ├── [-rw-r--r--  1.2K]  gcc-plugin.h
+    │   │               │   ├── [-rw-r--r--  6.3K]  gcc-rich-location.h
+    │   │               │   ├── [-rw-r--r--   942]  gcc-symtab.h
+    │   │               │   ├── [-rw-r--r--  3.0K]  gcc.h
+    │   │               │   ├── [-rw-r--r--  1.8K]  gcov-counter.def
+    │   │               │   ├── [-rw-r--r--   15K]  gcov-io.h
+    │   │               │   ├── [-rw-r--r--  1.4K]  gcse-common.h
+    │   │               │   ├── [-rw-r--r--  1.5K]  gcse.h
+    │   │               │   ├── [-rw-r--r--  1.2K]  generic-match.h
+    │   │               │   ├── [-rw-r--r--   17K]  gengtype.h
+    │   │               │   ├── [-rw-r--r--   46K]  genrtl.h
+    │   │               │   ├── [-rw-r--r--  6.8K]  gensupport.h
+    │   │               │   ├── [-rw-r--r--  3.8K]  ggc-internal.h
+    │   │               │   ├── [-rw-r--r--   11K]  ggc.h
+    │   │               │   ├── [-rw-r--r--  1.5K]  gimple-array-bounds.h
+    │   │               │   ├── [-rw-r--r--  1.5K]  gimple-builder.h
+    │   │               │   ├── [-rw-r--r--  5.0K]  gimple-expr.h
+    │   │               │   ├── [-rw-r--r--   11K]  gimple-fold.h
+    │   │               │   ├── [-rw-r--r--   10K]  gimple-iterator.h
+    │   │               │   ├── [-rw-r--r--   981]  gimple-low.h
+    │   │               │   ├── [-rw-r--r--  8.8K]  gimple-match.h
+    │   │               │   ├── [-rw-r--r--  4.9K]  gimple-predicate-analysis.h
+    │   │               │   ├── [-rw-r--r--  2.5K]  gimple-predict.h
+    │   │               │   ├── [-rw-r--r--  1.6K]  gimple-pretty-print.h
+    │   │               │   ├── [-rw-r--r--  4.0K]  gimple-range-cache.h
+    │   │               │   ├── [-rw-r--r--  2.1K]  gimple-range-edge.h
+    │   │               │   ├── [-rw-r--r--  6.2K]  gimple-range-fold.h
+    │   │               │   ├── [-rw-r--r--  8.5K]  gimple-range-gori.h
+    │   │               │   ├── [-rw-r--r--  3.0K]  gimple-range-infer.h
+    │   │               │   ├── [-rw-r--r--  2.0K]  gimple-range-op.h
+    │   │               │   ├── [-rw-r--r--  4.3K]  gimple-range-path.h
+    │   │               │   ├── [-rw-r--r--  2.3K]  gimple-range-trace.h
+    │   │               │   ├── [-rw-r--r--  3.8K]  gimple-range.h
+    │   │               │   ├── [-rw-r--r--  1.9K]  gimple-ssa-warn-access.h
+    │   ���               │   ├── [-rw-r--r--  1.1K]  gimple-ssa-warn-restrict.h
+    │   │               │   ├── [-rw-r--r--  5.3K]  gimple-ssa.h
+    │   │               │   ├── [-rw-r--r--  1.1K]  gimple-streamer.h
+    │   │               │   ├── [-rw-r--r--  4.2K]  gimple-walk.h
+    │   │               │   ├── [-rw-r--r--   17K]  gimple.def
+    │   │               │   ├── [-rw-r--r--  158K]  gimple.h
+    │   │               │   ├── [-rw-r--r--  1.5K]  gimplify-me.h
+    │   │               │   ├── [-rw-r--r--  3.5K]  gimplify.h
+    │   │               │   ├── [-rw-r--r--  4.6K]  glimits.h
+    │   │               │   ├── [-rw-r--r--   15K]  gomp-constants.h
+    │   │               │   ├── [-rw-r--r--   951]  graph.h
+    │   │               │   ├── [-rw-r--r--  2.2K]  graphds.h
+    │   │               │   ├── [-rw-r--r--   12K]  graphite.h
+    │   │               │   ├── [-rw-r--r--  1.5K]  graphviz.h
+    │   │               │   ├── [-rw-r--r--  2.4K]  gsstruct.def
+    │   │               │   ├── [-rw-r--r--  1.7K]  gsyms.h
+    │   │               │   ├── [-rw-r--r--   330]  gsyslimits.h
+    │   │               │   ├── [-rw-r--r--  9.9K]  gtm-builtins.def
+    │   │               │   ├── [-rw-r--r--  173K]  gtype-desc.h
+    │   │               │   ├── [-rw-r--r--   16K]  hard-reg-set.h
+    │   │               │   ├── [-rw-r--r--  5.5K]  hash-map-traits.h
+    │   │               │   ├── [-rw-r--r--   11K]  hash-map.h
+    │   │               │   ├── [-rw-r--r--  5.6K]  hash-set.h
+    │   │               │   ├── [-rw-r--r--   39K]  hash-table.h
+    │   │               │   ├── [-rw-r--r--   11K]  hash-traits.h
+    │   │               │   ├── [-rw-r--r--  7.2K]  hashtab.h
+    │   │               │   ├── [-rw-r--r--  1.1K]  highlev-plugin-common.h
+    │   │               │   ├── [-rw-r--r--  6.1K]  hooks.h
+    │   │               │   ├── [-rw-r--r--  1.8K]  hosthooks-def.h
+    │   │               │   ├── [-rw-r--r--  1.9K]  hosthooks.h
+    │   │               │   ├── [-rw-r--r--  5.5K]  hw-doloop.h
+    │   │               │   ├── [-rw-r--r--   10K]  hwint.h
+    │   │               │   ├── [-rw-r--r--  4.2K]  ifcvt.h
+    │   │               │   ├── [-rw-r--r--  5.1K]  inchash.h
+    │   │               │   ├── [-rw-r--r--  1.7K]  incpath.h
+    │   │               │   ├── [-rw-r--r--  8.9K]  input.h
+    │   │               │   ├── [-rw-r--r--  1.8K]  insn-addr.h
+    │   │               │   ├── [-rw-r--r--  5.5K]  insn-attr-common.h
+    │   │               │   ├── [-rw-r--r--   11K]  insn-attr.h
+    │   │               │   ├── [-rw-r--r--  303K]  insn-codes.h
+    │   │               │   ├── [-rw-r--r--   526]  insn-config.h
+    │   │               │   ├── [-rw-r--r--   11K]  insn-constants.h
+    │   │               │   ├── [-rw-r--r--  1.3M]  insn-flags.h
+    │   │               │   ├── [-rw-r--r--   24K]  insn-modes-inline.h
+    │   │               │   ├── [-rw-r--r--   28K]  insn-modes.h
+    │   │               │   ├── [-rw-r--r--  3.5K]  insn-notes.def
+    │   │               │   ├── [-rw-r--r--  2.6K]  int-vector-builder.h
+    │   │               │   ├── [-rw-r--r--   22K]  internal-fn.def
+    │   │               │   ├── [-rw-r--r--  8.8K]  internal-fn.h
+    │   │               │   ├── [-rw-r--r--  2.0K]  intl.h
+    │   │               │   ├── [-rw-r--r--   16K]  ipa-fnsummary.h
+    │   │               │   ├── [-rw-r--r--   11K]  ipa-icf-gimple.h
+    │   │               │   ├── [-rw-r--r--   21K]  ipa-icf.h
+    │   │               │   ├── [-rw-r--r--  4.2K]  ipa-inline.h
+    │   │               │   ├── [-rw-r--r--   22K]  ipa-modref-tree.h
+    │   │               │   ├── [-rw-r--r--  4.9K]  ipa-modref.h
+    │   │               │   ├── [-rw-r--r--   18K]  ipa-param-manipulation.h
+    │   │               │   ├── [-rw-r--r--  8.7K]  ipa-predicate.h
+    │   │               │   ├── [-rw-r--r--   40K]  ipa-prop.h
+    │   │               │   ├── [-rw-r--r--  3.4K]  ipa-ref.h
+    │   │               │   ├── [-rw-r--r--  1.1K]  ipa-reference.h
+    │   │               │   ├── [-rw-r--r--  9.5K]  ipa-utils.h
+    │   │               │   ├── [-rw-r--r--   61K]  ira-int.h
+    │   │               │   ├── [-rw-r--r--  9.7K]  ira.h
+    │   │               │   ├── [-rw-r--r--  7.5K]  is-a.h
+    │   │               │   ├── [-rw-r--r--  5.8K]  iterator-utils.h
+    │   │               │   ├── [-rw-r--r--  4.6K]  json.h
+    │   │               │   ├── [-rw-r--r--   17K]  langhooks-def.h
+    │   │               │   ├── [-rw-r--r--   27K]  langhooks.h
+    │   │               │   ├── [-rw-r--r--  1.3K]  lcm.h
+    │   │               │   ├── [-rw-r--r--  2.5K]  libfuncs.h
+    │   │               │   ├── [-rw-r--r--   27K]  libiberty.h
+    │   │               │   ├── [-rw-r--r--  1.4K]  limitx.h
+    │   │               │   ├── [-rw-r--r--   270]  limity.h
+    │   │               │   ├── [-rw-r--r--   72K]  line-map.h
+    │   │               │   ├── [-rw-r--r--  2.4K]  logical-location.h
+    │   │               │   ├── [-rw-r--r--   893]  loop-unroll.h
+    │   │               │   ├── [-rw-r--r--  2.0K]  lower-subreg.h
+    │   │               │   ├── [-rw-r--r--   18K]  lra-int.h
+    │   │               │   ├── [-rw-r--r--  1.3K]  lra.h
+    │   │               │   ├── [-rw-r--r--  1.6K]  lto-compress.h
+    │   │               │   ├── [-rw-r--r--  1.6K]  lto-section-names.h
+    │   │               │   ├── [-rw-r--r--   37K]  lto-streamer.h
+    │   │               │   ├── [drwxr-xr-x     3]  m2
+    │   │               │   │   └── [-rw-r--r--   975]  m2-tree.def
+    │   │               │   ├── [-rw-r--r--   11K]  machmode.def
+    │   │               │   ├── [-rw-r--r--   35K]  machmode.h
+    │   │               │   ├── [-rw-r--r--  1.5K]  make-unique.h
+    │   │               │   ├── [-rw-r--r--  5.3K]  md5.h
+    │   │               │   ├── [-rw-r--r--  1.2K]  mem-stats-traits.h
+    │   │               │   ├── [-rw-r--r--   18K]  mem-stats.h
+    │   │               │   ├── [-rw-r--r--  3.3K]  memmodel.h
+    │   │               │   ├── [-rw-r--r--  2.4K]  memory-block.h
+    │   │               │   ├── [-rw-r--r--  2.0K]  mode-classes.def
+    │   │               │   ├── [-rw-r--r--  7.4K]  mux-utils.h
+    │   │               │   ├── [drwxr-xr-x     3]  objc
+    │   │               │   │   └── [-rw-r--r--  3.3K]  objc-tree.def
+    │   │               │   ├── [-rw-r--r--  2.4K]  obstack-utils.h
+    │   │               │   ├── [-rw-r--r--   22K]  obstack.h
+    │   │               │   ├── [-rw-r--r--   22K]  omp-builtins.def
+    │   │               │   ├── [-rw-r--r--  1.1K]  omp-expand.h
+    │   │               │   ├── [-rw-r--r--  5.8K]  omp-general.h
+    │   │               │   ├── [-rw-r--r--  1.1K]  omp-low.h
+    │   │               │   ├── [-rw-r--r--  1.2K]  omp-offload.h
+    │   │               │   ├── [-rw-r--r--   880]  omp-simd-clone.h
+    │   │               │   ├── [-rw-r--r--  9.2K]  opt-problem.h
+    │   │               │   ├── [-rw-r--r--  2.5K]  opt-suggestions.h
+    │   │               │   ├── [-rw-r--r--  3.4K]  optabs-libfuncs.h
+    │   │               │   ├── [-rw-r--r--  6.9K]  optabs-query.h
+    │   │               │   ├── [-rw-r--r--  1.8K]  optabs-tree.h
+    │   │               │   ├── [-rw-r--r--   22K]  optabs.def
+    │   │               │   ├── [-rw-r--r--   14K]  optabs.h
+    │   │               │   ├── [-rw-r--r--  2.0K]  optinfo-emit-json.h
+    │   │               │   ├── [-rw-r--r--  5.0K]  optinfo.h
+    │   │               │   ├── [-rw-r--r--  492K]  options.h
+    │   │               │   ├── [-rw-r--r--  1.0K]  opts-diagnostic.h
+    │   │               │   ├── [-rw-r--r--  1.7K]  opts-jobserver.h
+    │   │               │   ├── [-rw-r--r--   20K]  opts.h
+    │   │               │   ├── [-rw-r--r--  4.9K]  ordered-hash-map.h
+     │   │               │   ├── [-rw-r--r--   25K]  output.h
+    │   │               │   ├── [-rw-r--r--   24K]  pass-instances.def
+    │   │               │   ├── [-rw-r--r--  4.0K]  pass_manager.h
+    │   │               │   ├── [-rw-r--r--   22K]  passes.def
+    │   │               │   ├── [-rw-r--r--   18K]  plugin-api.h
+    │   │               │   ├── [-rw-r--r--   595]  plugin-version.h
+    │   │               │   ├── [-rw-r--r--  3.3K]  plugin.def
+    │   │               │   ├── [-rw-r--r--  6.4K]  plugin.h
+    │   │               │   ├── [-rw-r--r--  9.5K]  pointer-query.h
+    │   │               │   ├── [-rw-r--r--  4.2K]  poly-int-types.h
+    │   │               │   ├── [-rw-r--r--   80K]  poly-int.h
+    │   │               │   ├── [-rw-r--r--  9.9K]  predict.def
+    │   │               │   ├── [-rw-r--r--  4.6K]  predict.h
+    │   │               │   ├── [-rw-r--r--  1.2K]  prefix.h
+    │   │               │   ├── [-rw-r--r--   16K]  pretty-print.h
+    │   │               │   ├── [-rw-r--r--  5.5K]  print-rtl.h
+    │   │               │   ├── [-rw-r--r--  1.9K]  print-tree.h
+    │   │               │   ├── [-rw-r--r--   38K]  profile-count.h
+    │   │               │   ├── [-rw-r--r--  2.3K]  profile.h
+    │   │               │   ├── [-rw-r--r--   11K]  range-op.h
+    │   │               │   ├── [-rw-r--r--  1.7K]  range.h
+    │   │               │   ├── [-rw-r--r--   13K]  read-md.h
+    │   │               │   ├── [-rw-r--r--  1002]  read-rtl-function.h
+    │   │               │   ├── [-rw-r--r--   21K]  real.h
+    │   │               │   ├── [-rw-r--r--  1.3K]  realmpfr.h
+    │   │               │   ├── [-rw-r--r--   18K]  recog.h
+    │   │               │   ├── [-rw-r--r--   11K]  reg-notes.def
+    │   │               │   ├── [-rw-r--r--   877]  regcprop.h
+    │   │               │   ├── [-rw-r--r--  3.5K]  regrename.h
+    │��  │               │   ├── [-rw-r--r--   12K]  regs.h
+    │   │               │   ├── [-rw-r--r--  4.7K]  regset.h
+    │   │               │   ├── [-rw-r--r--   17K]  reload.h
+    │   │               │   ├── [-rw-r--r--  1.9K]  resource.h
+    │   │               │   ├── [-rw-r--r--  1.0K]  rtl-error.h
+    │   │               │   ├── [-rw-r--r--  8.2K]  rtl-iter.h
+    │   │               │   ├── [-rw-r--r--  1.9K]  rtl-ssa.h
+    │   │               │   ├── [-rw-r--r--   60K]  rtl.def
+    │   │               │   ├── [-rw-r--r--  156K]  rtl.h
+    │   │               │   ├── [-rw-r--r--   10K]  rtlanal.h
+    │   │               │   ├── [-rw-r--r--   850]  rtlhash.h
+    │   │               │   ├── [-rw-r--r--  1.8K]  rtlhooks-def.h
+    │   │               │   ├── [-rw-r--r--  3.8K]  rtx-vector-builder.h
+    │   │               │   ├── [-rw-r--r--   884]  run-rtl-passes.h
+    │   │               │   ├── [-rw-r--r--  5.5K]  safe-ctype.h
+    │   │               │   ├── [-rw-r--r--   33K]  sanitizer.def
+    │   │               │   ├── [-rw-r--r--   10K]  sbitmap.h
+    │   │               │   ├── [-rw-r--r--   60K]  sched-int.h
+    │   │               │   ├── [-rw-r--r--  6.8K]  sel-sched-dump.h
+    │   │               │   ├── [-rw-r--r--   48K]  sel-sched-ir.h
+    │   │               │   ├── [-rw-r--r--   920]  sel-sched.h
+    │   │               │   ├── [-rw-r--r--  1.5K]  selftest-diagnostic.h
+    │   │               │   ├── [-rw-r--r--  3.2K]  selftest-rtl.h
+    │   │               │   ├── [-rw-r--r--   15K]  selftest.h
+    │   │               │   ├── [-rw-r--r--  7.3K]  sese.h
+    │   │               │   ├── [-rw-r--r--  6.1K]  shortest-paths.h
+    │   │               │   ├── [-rw-r--r--  1.1K]  shrink-wrap.h
+    │   │               │   ├── [-rw-r--r--  1.0K]  signop.h
+    │   │               │   ├── [-rw-r--r--  6.7K]  sparseset.h
+    │   │               │   ├── [-rw-r--r--  1.4K]  spellcheck-tree.h
+    │   │               │   ├── [-rw-r--r--  7.2K]  spellcheck.h
+    │   │               │   ├── [-rw-r--r--   16K]  splay-tree-utils.h
+    │   │               │   ├── [-rw-r--r--  6.1K]  splay-tree.h
+    │   │               │   ├── [-rw-r--r--  6.4K]  sreal.h
+    │   │               │   ├── [-rw-r--r--   29K]  ssa-iterators.h
+    │   │               │   ├── [-rw-r--r--  1.0K]  ssa.h
+    │   │               │   ├── [-rw-r--r--  2.8K]  statistics.h
+    │   │               │   ├── [-rw-r--r--  2.0K]  stmt.h
+    │   │               │   ├── [-rw-r--r--  5.0K]  stor-layout.h
+    │   │               │   ├── [-rw-r--r--  3.6K]  streamer-hooks.h
+    │   │               │   ├── [-rw-r--r--  1.5K]  stringpool.h
+    │   │               │   ├── [-rw-r--r--  4.6K]  substring-locations.h
+    │   │               │   ├── [-rw-r--r--   27K]  symbol-summary.h
+    │   │               │   ├── [-rw-r--r--  2.0K]  symtab-clones.h
+    │   │               │   ├── [-rw-r--r--  4.9K]  symtab-thunks.h
+    │   │               │   ├── [-rw-r--r--  3.6K]  symtab.h
+    │   │               │   ├── [-rw-r--r--   27K]  sync-builtins.def
+    │   │               │   ├── [-rw-r--r--   41K]  system.h
+    │   │               │   ├── [-rw-r--r--  4.2K]  target-def.h
+    │   │               │   ���── [-rw-r--r--  3.3K]  target-globals.h
+    │   │               │   ├── [-rw-r--r--  4.0K]  target-hooks-macros.h
+    │   │               │   ├── [-rw-r--r--  5.3K]  target-insns.def
+    │   │               │   ├── [-rw-r--r--  317K]  target.def
+    │   │               │   ├── [-rw-r--r--  9.1K]  target.h
+    │   │               │   ├── [-rw-r--r--   14K]  targhooks.h
+    │   │               │   ├── [-rw-r--r--   18K]  timevar.def
+    │   │               │   ├── [-rw-r--r--  7.6K]  timevar.h
+    │   │               │   ├── [-rw-r--r--   15K]  tm-preds.h
+    │   │               │   ├── [-rw-r--r--  1.2K]  tm.h
+    │   │               │   ├── [-rw-r--r--   178]  tm_p.h
+    │   │               │   ├── [-rw-r--r--  2.8K]  toplev.h
+    │   │               │   ├── [-rw-r--r--   903]  tracer.h
+    │   │               │   ├── [-rw-r--r--  1.9K]  trans-mem.h
+    │   │               │   ├── [-rw-r--r--  3.8K]  tree-affine.h
+    │   │               │   ├── [-rw-r--r--  5.8K]  tree-cfg.h
+    │   │               │   ├── [-rw-r--r--  1.2K]  tree-cfgcleanup.h
+    │   │               │   ├── [-rw-r--r--   23K]  tree-check.h
+    │   │               │   ├── [-rw-r--r--  7.1K]  tree-chrec.h
+    │   │               │   ├── [-rw-r--r--   68K]  tree-core.h
+    │   │               │   ├── [-rw-r--r--   25K]  tree-data-ref.h
+    │   │               │   ├── [-rw-r--r--  1.9K]  tree-dfa.h
+    │   │               │   ├── [-rw-r--r--  2.7K]  tree-diagnostic.h
+    │   │               │   ├── [-rw-r--r--  2.8K]  tree-dump.h
+    │   │               │   ├── [-rw-r--r--  2.4K]  tree-eh.h
+    │   │               │   ├── [-rw-r--r--  1.2K]  tree-hash-traits.h
+    │   │               │   ├── [-rw-r--r--  1.9K]  tree-hasher.h
+    │   │               │   ├── [-rw-r--r--   845]  tree-if-conv.h
+    │   │               │   ├── [-rw-r--r--  8.6K]  tree-inline.h
+    │   │               │   ├── [-rw-r--r--  1.9K]  tree-into-ssa.h
+    │   │               │   ├── [-rw-r--r--  4.1K]  tree-iterator.h
+    │   │               │   ├── [-rw-r--r--  2.2K]  tree-logical-location.h
+    │   │               │   ├── [-rw-r--r--  2.7K]  tree-nested.h
+    │   │               │   ├── [-rw-r--r--  1.1K]  tree-object-size.h
+    │   │               │   ├── [-rw-r--r--  2.7K]  tree-outof-ssa.h
+    │   │               │   ├── [-rw-r--r--   864]  tree-parloops.h
+    │   │               │   ├── [-rw-r--r--   33K]  tree-pass.h
+    │   │               │   ├── [-rw-r--r--  2.2K]  tree-phinodes.h
+    │   │               │   ├── [-rw-r--r--  2.5K]  tree-pretty-print.h
+    │   │               │   ├── [-rw-r--r--  2.6K]  tree-scalar-evolution.h
+    │   │               │   ├── [-rw-r--r--  1.1K]  tree-sra.h
+    │   │               │   ├── [-rw-r--r--  1.6K]  tree-ssa-address.h
+    │   │               │   ├── [-rw-r--r--  1.3K]  tree-ssa-alias-compare.h
+    │   │               │   ├── [-rw-r--r--  7.7K]  tree-ssa-alias.h
+    │   │               │   ├── [-rw-r--r--  1.1K]  tree-ssa-ccp.h
+    │   │               │   ├── [-rw-r--r--   925]  tree-ssa-coalesce.h
+    │   │               │   ├── [-rw-r--r--   783]  tree-ssa-dce.h
+    │   │               │   ├── [-rw-r--r--   866]  tree-ssa-dom.h
+    │   │               │   ├── [-rw-r--r--  1.2K]  tree-ssa-dse.h
+    │   │               │   ├── [-rw-r--r--  9.6K]  tree-ssa-live.h
+    │   │               │   ├── [-rw-r--r--  1.5K]  tree-ssa-loop-ivopts.h
+    │   │               │   ├── [-rw-r--r--  2.2K]  tree-ssa-loop-manip.h
+    │   │               │   ├── [-rw-r--r--  3.0K]  tree-ssa-loop-niter.h
+    │   │               │   ├── [-rw-r--r--  2.8K]  tree-ssa-loop.h
+    │   │               │   ├── [-rw-r--r--   948]  tree-ssa-math-opts.h
+    │   │               │   ├── [-rw-r--r--  3.9K]  tree-ssa-operands.h
+    │   │               │   ├── [-rw-r--r--  4.1K]  tree-ssa-propagate.h
+    │   │               │   ├── [-rw-r--r--  1.3K]  tree-ssa-reassoc.h
+    │   │               │   ├── [-rw-r--r--   10K]  tree-ssa-sccvn.h
+    │   │               │   ├── [-rw-r--r--  6.8K]  tree-ssa-scopedtables.h
+    │   │               │   ├── [-rw-r--r--  1.5K]  tree-ssa-strlen.h
+    │   │               │   ├── [-rw-r--r--   917]  tree-ssa-ter.h
+    │   │               │   ├── [-rw-r--r--  4.1K]  tree-ssa-threadedge.h
+    │   │               │   ├── [-rw-r--r--  4.7K]  tree-ssa-threadupdate.h
+    │   │               │   ├── [-rw-r--r--  3.5K]  tree-ssa.h
+    │   │               │   ├── [-rw-r--r--  4.7K]  tree-ssanames.h
+    │   │               │   ├── [-rw-r--r--  1.1K]  tree-stdarg.h
+    │   │               │   ├── [-rw-r--r--  4.2K]  tree-streamer.h
+    │   │               │   ├── [-rw-r--r--   28K]  tree-switch-conversion.h
+    │   │               │   ├── [-rw-r--r--  4.3K]  tree-vector-builder.h
+    │   │               │   ├── [-rw-r--r--   92K]  tree-vectorizer.h
+    │   │               │   ├── [-rw-r--r--  1.7K]  tree-vrp.h
+    │   │               │   ├── [-rw-r--r--   71K]  tree.def
+    │   │               │   ├── [-rw-r--r--  257K]  tree.h
+    │   │               │   ├── [-rw-r--r--  2.8K]  treestruct.def
+    │   │               │   ├── [-rw-r--r--  2.0K]  tristate.h
+    │   │               │   ├── [-rw-r--r--   876]  tsan.h
+    │   │               │   ├── [-rw-r--r--  3.8K]  tsystem.h
+    │   │               │   ├── [-rw-r--r--  1.5K]  typeclass.h
+    │   │               │   ├── [-rw-r--r--   16K]  typed-splay-tree.h
+    │   │               │   ├── [-rw-r--r--  2.4K]  ubsan.h
+    │   │               │   ├── [-rw-r--r--  4.5K]  valtrack.h
+    │   │               │   ├── [-rw-r--r--  2.0K]  value-pointer-equiv.h
+    │   │               │   ├── [-rw-r--r--  4.7K]  value-prof.h
+    │   │               │   ├── [-rw-r--r--  5.2K]  value-query.h
+    │   │               │   ├── [-rw-r--r--  1.4K]  value-range-pretty-print.h
+    │   │               │   ├── [-rw-r--r--  6.4K]  value-range-storage.h
+    │   │               │   ├── [-rw-r--r--   33K]  value-range.h
+    │   │               │   ├── [-rw-r--r--   17K]  value-relation.h
+    │   │               │   ├── [-rw-r--r--  3.3K]  varasm.h
+    │   │               │   ├── [-rw-r--r--  5.3K]  vec-perm-indices.h
+    │   │               │   ├── [-rw-r--r--   67K]  vec.h
+    │   │               │   ├── [-rw-r--r--   20K]  vector-builder.h
+    │   │               │   ├── [-rw-r--r--   843]  version.h
+    │   │               │   ├── [-rw-r--r--  6.4K]  vmsdbg.h
+    │   │               │   ├── [-rw-r--r--  3.3K]  vr-values.h
+    │   │               │   ���── [-rw-r--r--  6.7K]  vtable-verify.h
+    │   │               │   ├── [-rw-r--r--  3.3K]  wide-int-bitmask.h
+    │   │               │   ├── [-rw-r--r--  1.4K]  wide-int-print.h
+    │   │               │   ├── [-rw-r--r--  111K]  wide-int.h
+    │   │               │   └── [-rw-r--r--  1.1K]  xcoff.h
+    │   │               ├── [-rwxr-xr-x  1.0K]  libcc1plugin.la
+    │   │               ├── [lrwxrwxrwx    21]  libcc1plugin.so -> libcc1plugin.so.0.0.0
+    │   │               ├── [lrwxrwxrwx    21]  libcc1plugin.so.0 ->                    ↵
+
+    │   │               ├── [-rwxr-xr-x   55K]  libcc1plugin.so.0.0.0
+    │   │               ├── [-rwxr-xr-x  1.0K]  libcp1plugin.la
+    │   │               ├── [lrwxrwxrwx    21]  libcp1plugin.so -> libcp1plugin.so.0.0.0
+    │   │               ├── [lrwxrwxrwx    21]  libcp1plugin.so.0 -> libcp1plugin.so.0.0.0
+    │   │               └── [-rwxr-xr-x  120K]  libcp1plugin.so.0.0.0
+    │   ├── [-rw-r--r--  2.9M]  libasan.a
+    │   ├── [-rwxr-xr-x  1000]  libasan.la
+    │   ├── [lrwxrwxrwx    16]  libasan.so -> libasan.so.8.0.0
+    │   ├── [lrwxrwxrwx    16]  libasan.so.8 -> libasan.so.8.0.0
+    │   ├── [-rwxr-xr-x  1.4M]  libasan.so.8.0.0
+    │   ├── [-rw-r--r--  9.3K]  libasan_preinit.o
+    │   ├── [-rw-r--r--  147K]  libatomic.a
+    │   ├── [-rwxr-xr-x   964]  libatomic.la
+    │   ├── [lrwxrwxrwx    18]  libatomic.so -> libatomic.so.1.2.0
+    │   ├── [lrwxrwxrwx    18]  libatomic.so.1 -> libatomic.so.1.2.0
+    │   ├── [-rwxr-xr-x   30K]  libatomic.so.1.2.0
+    │   ├── [-rwxr-xr-x   962]  libcc1.la
+    │   ├── [lrwxrwxrwx    15]  libcc1.so -> libcc1.so.0.0.0
+    │   ├── [lrwxrwxrwx    15]  libcc1.so.0 -> libcc1.so.0.0.0
+    │   ├── [-rwxr-xr-x  123K]  libcc1.so.0.0.0
+    │   ├── [-rw-r--r--   132]  libgcc_s.so
+    │   ├── [-rw-r--r--  711K]  libgcc_s.so.1
+    │   ├── [-rw-r--r--  531K]  libgomp.a
+    │   ├── [-rwxr-xr-x   946]  libgomp.la
+    │   ├── [lrwxrwxrwx    16]  libgomp.so -> libgomp.so.1.0.0
+    │   ├── [lrwxrwxrwx    16]  libgomp.so.1 -> libgomp.so.1.0.0
+    │   ├── [-rwxr-xr-x  296K]  libgomp.so.1.0.0
+    │   ├── [-rw-r--r--   164]  libgomp.spec
+    │   ├── [-rw-r--r--  1.1M]  libhwasan.a
+    │   ├── [-rwxr-xr-x  1014]  libhwasan.la
+    │   ├── [lrwxrwxrwx    18]  libhwasan.so -> libhwasan.so.0.0.0
+    │   ├── [lrwxrwxrwx    18]  libhwasan.so.0 -> libhwasan.so.0.0.0
+    │   ├── [-rwxr-xr-x  461K]  libhwasan.so.0.0.0
+    │   ├── [-rw-r--r--  4.9K]  libhwasan_preinit.o
+    │   ├── [-rw-r--r--  201K]  libitm.a
+    │   ├── [-rwxr-xr-x   934]  libitm.la
+    │   ├── [lrwxrwxrwx    15]  libitm.so -> libitm.so.1.0.0
+    │   ├── [lrwxrwxrwx    15]  libitm.so.1 -> libitm.so.1.0.0
+    │   ├── [-rwxr-xr-x   98K]  libitm.so.1.0.0
+    │   ├── [-rw-r--r--   162]  libitm.spec
+    │   ├── [-rw-r--r--  1.1M]  liblsan.a
+    │   ├── [-rwxr-xr-x  1000]  liblsan.la
+    │   ├── [lrwxrwxrwx    16]  liblsan.so -> liblsan.so.0.0.0
+    │   ├── [lrwxrwxrwx    16]  liblsan.so.0 -> liblsan.so.0.0.0
+    │   ├── [-rwxr-xr-x  445K]  liblsan.so.0.0.0
+    │   ├── [-rw-r--r--  4.8K]  liblsan_preinit.o
+    │   ├── [-rw-r--r--  624K]  libquadmath.a
+    │   ├── [-rwxr-xr-x   973]  libquadmath.la
+    │   ├── [lrwxrwxrwx    20]  libquadmath.so -> libquadmath.so.0.0.0
+    │   ├── [lrwxrwxrwx    20]  libquadmath.so.0 -> libquadmath.so.0.0.0
+    │   ├── [-rwxr-xr-x  283K]  libquadmath.so.0.0.0
+    │   ├── [-rw-r--r--   362]  libsanitizer.spec
+    │   ├── [-rw-r--r--   26K]  libssp.a
+    │   ├── [-rwxr-xr-x   934]  libssp.la
+    │   ├── [lrwxrwxrwx    15]  libssp.so -> libssp.so.0.0.0
+    │   ├── [lrwxrwxrwx    15]  libssp.so.0 -> libssp.so.0.0.0
+    │   ├── [-rwxr-xr-x   14K]  libssp.so.0.0.0
+    │   ├── [-rw-r--r--  1.6K]  libssp_nonshared.a
+    │   ├── [-rwxr-xr-x   916]  libssp_nonshared.la
+    │   ├── [-rw-r--r--  6.2M]  libstdc++.a
+    │   ├── [-rwxr-xr-x   961]  libstdc++.la
+    │   ├── [lrwxrwxrwx    19]  libstdc++.so -> libstdc++.so.6.0.32
+    │   ├── [lrwxrwxrwx    19]  libstdc++.so.6 -> libstdc++.so.6.0.32
+    │   ├── [-rwxr-xr-x  2.3M]  libstdc++.so.6.0.32
+    │   ├── [-rw-r--r--  2.3K]  libstdc++.so.6.0.32-gdb.py
+    │   ├── [-rw-r--r--  5.3K]  libstdc++exp.a
+    │   ├── [-rwxr-xr-x   904]  libstdc++exp.la
+    │   ├── [-rw-r--r--  705K]  libstdc++fs.a
+    │   ├── [-rwxr-xr-x   901]  libstdc++fs.la
+    │   ├── [-rw-r--r--  370K]  libsupc++.a
+    │   ├── [-rwxr-xr-x   895]  libsupc++.la
+    │   ├── [-rw-r--r--  2.3M]  libtsan.a
+    │   ├── [-rwxr-xr-x  1000]  libtsan.la
+    │   ├── [lrwxrwxrwx    16]  libtsan.so -> libtsan.so.2.0.0
+    │   ├── [lrwxrwxrwx    16]  libtsan.so.2 -> libtsan.so.2.0.0
+    │   ├── [-rwxr-xr-x  1.1M]  libtsan.so.2.0.0
+    │   ├── [-rw-r--r--  3.9K]  libtsan_preinit.o
+    │   ├── [-rw-r--r--  997K]  libubsan.a
+    │   ├── [-rwxr-xr-x  1007]  libubsan.la
+    │   ├── [lrwxrwxrwx    17]  libubsan.so -> libubsan.so.1.0.0
+    │   ├── [lrwxrwxrwx    17]  libubsan.so.1 -> libubsan.so.1.0.0
+    │   └── [-rwxr-xr-x  426K]  libubsan.so.1.0.0
+    └── [drwxr-xr-x     3]  libexec
+        └── [drwxr-xr-x     3]  gcc
+            └── [drwxr-xr-x     3]  x86_64-linux-gnu
+                └── [drwxr-xr-x    12]  13.2.0
+                    ├── [-rwxr-xr-x   32M]  cc1
+                    ├── [-rwxr-xr-x   34M]  cc1plus
+                    ├── [-rwxr-xr-x  969K]  collect2
+                    ├── [-rwxr-xr-x  215K]  g++-mapper-server
+                    ├── [drwxr-xr-x     6]  install-tools
+                    │   ├── [-rwxr-xr-x   14K]  fixinc.sh
+                    │   ├── [-rwxr-xr-x  169K]  fixincl
+                    │   ├── [-rwxr-xr-x  3.6K]  mkheaders
+                    │   └── [-rwxr-xr-x  3.5K]  mkinstalldirs
+                    ├── [-rwxr-xr-x   989]  liblto_plugin.la
+                    ├── [-rwxr-xr-x   82K]  liblto_plugin.so
+                    ├── [-rwxr-xr-x  1.5M]  lto-wrapper
+                    ├── [-rwxr-xr-x   31M]  lto1
+                    └── [drwxr-xr-x     3]  plugin
+                        └── [-rwxr-xr-x  196K]  gengtype
+
+78 directories, 1556 files
+```
\ No newline at end of file
diff --git a/images/packages/gcc/werf.inc.yaml b/images/packages/gcc/werf.inc.yaml
index aca13e9d13..d64bb55201 100644
--- a/images/packages/gcc/werf.inc.yaml
+++ b/images/packages/gcc/werf.inc.yaml
@@ -9,6 +9,7 @@ import:
   before: setup
   includePaths:
   - usr/lib64/libgcc_s.so.1
+  - usr/lib64/libstdc++.so.6
 ---
 image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ $.ImageName }}
 final: false
@@ -31,11 +32,8 @@ secrets:
   value: {{ $.SOURCE_REPO_GIT }}
 shell:
   install:
-  - |
-    mkdir -p ~/.ssh && echo "StrictHostKeyChecking accept-new" > ~/.ssh/config
+  - git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
 
-    git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
-    
 ---
 {{- $name := print $.ImageName "-dependencies" -}}
 {{- define "$name" -}}
@@ -46,7 +44,7 @@ altPackages:
 - autogen dejagnu glibc-devel-static
 - tree
 packages:
-- zlib 
+- zlib
 - zstd
 {{- end -}}
 
@@ -78,7 +76,7 @@ shell:
       cp -a /$pkg/. /
       rm -rf /$pkg
     done
-    
+
     OUTDIR=/out
 
     cd /src
@@ -105,4 +103,4 @@ shell:
     make DESTDIR=$OUTDIR install-strip
     rm -rf $OUTDIR/usr/share
 
-    tree -sp $OUTDIR
+    tree -hp $OUTDIR
diff --git a/images/packages/glib2/werf.inc.yaml b/images/packages/glib2/werf.inc.yaml
index 7d33c9b5cd..6aa2190e7b 100644
--- a/images/packages/glib2/werf.inc.yaml
+++ b/images/packages/glib2/werf.inc.yaml
@@ -4,8 +4,10 @@ altPackages:
 - gcc gcc-c++
 - git pkg-config meson ninja-build cmake
 - libunwind-devel libelf-devel sysprof-devel libgvdb-devel
+- tree
 packages:
-- libffi zlib pcre2
+- libffi zlib pcre2 util-linux
+- selinux
 {{- end -}}
 
 {{- $builderDependencies := include "$name" . | fromYaml }}
@@ -90,6 +92,11 @@ shell:
       -Dlibdir=/usr/lib64 \
       -Dgtk_doc=false \
       -Dbuildtype=release \
-      -Dstrip=true
+      -Dstrip=true \
+      --default-library=both \
+      -Dselinux=enabled \
+      -Dlibmount=enabled
     meson compile -C _build
     DESTDIR=${OUTDIR} meson install -C _build
+
+    tree -hp $OUTDIR
diff --git a/images/packages/libjson-glib/werf.inc.yaml b/images/packages/libjson-glib/werf.inc.yaml
index 007c9abfb4..4f0b5d5691 100644
--- a/images/packages/libjson-glib/werf.inc.yaml
+++ b/images/packages/libjson-glib/werf.inc.yaml
@@ -28,8 +28,9 @@ shell:
 {{- define "$name" -}}
 altPackages:
 - gcc git make libtool gettext-tools meson ninja-build
-- glib2-devel libgio-devel
 - tree
+packages:
+- glib2 util-linux
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}
@@ -46,6 +47,7 @@ import:
   add: /src
   to: /src
   before: install
+{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}}
 shell:
   beforeInstall:
   {{- include "alt packages proxy" . | nindent 2 }}
@@ -57,6 +59,13 @@ shell:
 
   install:
   - |
+    # Install packages
+    PKGS="{{ $builderDependencies.packages | join " " }}"
+    for pkg in $PKGS; do
+      cp -a /$pkg/. /
+      rm -rf /$pkg
+    done
+
     OUTDIR=/out
     cd /src
     mkdir _build
diff --git a/images/packages/libpsl/werf.inc.yaml b/images/packages/libpsl/werf.inc.yaml
index 6b24262a8e..abd827ec98 100644
--- a/images/packages/libpsl/werf.inc.yaml
+++ b/images/packages/libpsl/werf.inc.yaml
@@ -28,12 +28,12 @@ altPackages:
 - gcc git make libtool gettext-tools meson ninja-build
 - rpm-build-python3
 - libicu-devel
-- glib2-devel libgio-devel
 - gtk-doc xsltproc
 - publicsuffix-list
 - publicsuffix-list-dafsa
 - tree
 packages:
+- glib2
 - libidn2 libunistring
 {{- end -}}
 
diff --git a/images/packages/libxkbcommon/README.md b/images/packages/libxkbcommon/README.md
new file mode 100644
index 0000000000..0a3874f099
--- /dev/null
+++ b/images/packages/libxkbcommon/README.md
@@ -0,0 +1,42 @@
+# libxkbcommon
+```
+└── [drwxr-xr-x     6]  usr
+    ├── [drwxr-xr-x     3]  bin
+    │   └── [-rwxr-xr-x   23K]  xkbcli
+    ├── [drwxr-xr-x     3]  include
+    │   └── [drwxr-xr-x     9]  xkbcommon
+    │       ├── [-rw-r--r--  3.1K]  xkbcommon-compat.h
+    │       ├── [-rw-r--r--   19K]  xkbcommon-compose.h
+    │       ├── [-rw-r--r--  244K]  xkbcommon-keysyms.h
+    │       ├── [-rw-r--r--  3.8K]  xkbcommon-names.h
+    │       ├── [-rw-r--r--  8.0K]  xkbcommon-x11.h
+    │       ├── [-rw-r--r--   72K]  xkbcommon.h
+    │       └── [-rw-r--r--   24K]  xkbregistry.h
+    ├── [drwxr-xr-x    12]  lib64
+    │   ├── [lrwxrwxrwx    21]  libxkbcommon-x11.so -> libxkbcommon-x11.so.0
+    │   ├── [lrwxrwxrwx    26]  libxkbcommon-x11.so.0 -> libxkbcommon-x11.so.0.10.0
+    │   ├── [-rwxr-xr-x   51K]  libxkbcommon-x11.so.0.10.0
+    │   ├── [lrwxrwxrwx    17]  libxkbcommon.so -> libxkbcommon.so.0
+    │   ├── [lrwxrwxrwx    22]  libxkbcommon.so.0 -> libxkbcommon.so.0.10.0
+    │   ├── [-rwxr-xr-x  416K]  libxkbcommon.so.0.10.0
+    │   ├── [lrwxrwxrwx    19]  libxkbregistry.so -> libxkbregistry.so.0
+    │   ├── [lrwxrwxrwx    24]  libxkbregistry.so.0 -> libxkbregistry.so.0.10.0
+    │   ├── [-rwxr-xr-x   43K]  libxkbregistry.so.0.10.0
+    │   └── [drwxr-xr-x     5]  pkgconfig
+    │       ├── [-rw-r--r--   291]  xkbcommon-x11.pc
+    │       ├── [-rw-r--r--   202]  xkbcommon.pc
+    │       └── [-rw-r--r--   269]  xkbregistry.pc
+    └── [drwxr-xr-x     3]  libexec
+        └── [drwxr-xr-x    11]  xkbcommon
+            ├── [-rwxr-xr-x   27K]  xkbcli-compile-compose
+            ├── [-rwxr-xr-x   31K]  xkbcli-compile-keymap
+            ├── [-rwxr-xr-x   47K]  xkbcli-dump-keymap-wayland
+            ├── [-rwxr-xr-x   23K]  xkbcli-dump-keymap-x11
+            ├── [-rwxr-xr-x   31K]  xkbcli-how-to-type
+            ├── [-rwxr-xr-x   31K]  xkbcli-interactive-evdev
+            ├── [-rwxr-xr-x   47K]  xkbcli-interactive-wayland
+            ├── [-rwxr-xr-x   27K]  xkbcli-interactive-x11
+            └── [-rwxr-xr-x   19K]  xkbcli-list
+
+9 directories, 29 files
+```
\ No newline at end of file
diff --git a/images/packages/libxkbcommon/werf.inc.yaml b/images/packages/libxkbcommon/werf.inc.yaml
new file mode 100644
index 0000000000..d2588dea23
--- /dev/null
+++ b/images/packages/libxkbcommon/werf.inc.yaml
@@ -0,0 +1,95 @@
+---
+image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}
+final: false
+fromImage: builder/scratch
+import:
+- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-builder
+  add: /out
+  to: /{{ $.ImageName }}
+  before: setup
+
+---
+{{- $version := get .PackageVersion .ImageName }}
+{{- $gitRepoUrl := "xkbcommon/libxkbcommon.git" }}
+image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact
+final: false
+fromImage: builder/src
+secrets:
+- id: SOURCE_REPO
+  value: {{ $.SOURCE_REPO_GIT }}
+shell:
+  install:
+  - |
+    git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
+
+---
+
+{{- $name := print $.ImageName "-dependencies" -}}
+{{- define "$name" -}}
+altPackages:
+- gcc git make libtool gettext-tools meson ninja-build bison
+- xkeyboard-config-devel
+- wayland-devel libwayland-client-devel wayland-protocols
+- libxcb-devel
+- bash-completion
+- tree
+packages:
+- libxml2
+{{- end -}}
+
+{{ $builderDependencies := include "$name" . | fromYaml }}
+
+
+image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-builder
+final: false
+fromImage: builder/alt
+secrets:
+- id: SOURCE_REPO
+  value: {{ $.SOURCE_REPO_GIT }}
+import:
+- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact
+  add: /src
+  to: /src
+  before: install
+{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}}
+shell:
+  beforeInstall:
+  {{- include "alt packages proxy" . | nindent 2 }}
+  - |
+    apt-get install -y \
+      {{ $builderDependencies.altPackages | join " " }}
+
+  {{- include "alt packages clean" . | nindent 2 }}
+
+  install:
+  - |
+    # Install packages
+    PKGS="{{ $builderDependencies.packages | join " " }}"
+    for pkg in $PKGS; do
+      cp -a /$pkg/. /
+      rm -rf /$pkg
+    done
+
+    OUTDIR=/out
+    cd /src
+    mkdir _build
+    /usr/bin/meson setup _build  \
+      --prefix=/usr \
+      --libdir=/usr/lib64 \
+      --wrap-mode=nofallback \
+      --wrap-mode=nodownload \
+      -Denable-docs=false \
+      -Denable-x11=true \
+      -Denable-xkbregistry=true \
+      -Ddefault_library=shared
+
+    ninja-build -j$(nproc) -C _build
+    DESTDIR=$OUTDIR ninja-build install -C _build
+    rm -rf $OUTDIR/usr/share
+    find $OUTDIR -type f -executable | while read -r execfile; do
+    if strip "$execfile"; then
+      echo "Stripped: $execfile"
+    fi
+    done
+    tree -hp $OUTDIR
+
diff --git a/images/packages/nbdkit/werf.inc.yaml b/images/packages/nbdkit/werf.inc.yaml
index 3f683018b8..99ce57a8ca 100644
--- a/images/packages/nbdkit/werf.inc.yaml
+++ b/images/packages/nbdkit/werf.inc.yaml
@@ -43,6 +43,7 @@ packages:
 - zstd
 - libxml2
 - libtasn1
+- libgcc1
 - libunistring
 {{- end -}}
 
diff --git a/images/packages/p11-kit/werf.inc.yaml b/images/packages/p11-kit/werf.inc.yaml
index 5a6da62753..a892d442d4 100644
--- a/images/packages/p11-kit/werf.inc.yaml
+++ b/images/packages/p11-kit/werf.inc.yaml
@@ -20,18 +20,33 @@ secrets:
   value: {{ $.SOURCE_REPO_GIT }}
 shell:
   install:
-  - git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
+  - |
+    git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src
+
+    # Download subprojects/pkcs11-json
+    cd /src
+    if [[ "$(cat /run/secrets/SOURCE_REPO)" =~ "github.com" ]] ; then
+      echo "Checkout submodules"
+      git submodule update --init --recursive --depth=1
+    else
+      echo "Checkout submodules with URL rewrite"
+      git \
+        -c url."$(cat /run/secrets/SOURCE_REPO)/".insteadOf=https://github.com/  \
+        submodule update --init --recursive --depth=1
+    fi
+
 ---
 
 {{- $name := print $.ImageName "-dependencies" -}}
 {{- define "$name" -}}
 altPackages:
 - git gcc gcc-c++ make meson ninja-build pkg-config
-- glib2-devel libffi-devel gettext-devel
-- openssl-devel ca-certificates
+- gettext-devel
+- ca-certificates
 - tree
 packages:
 - libtasn1
+- libffi openssl
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}
diff --git a/images/packages/selinux/README.md b/images/packages/selinux/README.md
index 668b9f9490..b89622b07c 100644
--- a/images/packages/selinux/README.md
+++ b/images/packages/selinux/README.md
@@ -1,355 +1,71 @@
 # selinux
 /selinux
 ```
-[drwxr-xr-x  4.0K]  ./
-├── [drwxr-xr-x  4.0K]  etc/
-│   ├── [drwxr-xr-x  4.0K]  dbus-1/
-│   │   └── [drwxr-xr-x  4.0K]  system.d/
-│   │       └── [-rw-r--r--   535]  org.selinux.conf
-│   ├── [drwxr-xr-x  4.0K]  pam.d/
-│   │   ├── [-rw-r--r--   284]  newrole
-│   │   └── [-rw-r--r--   283]  run_init
-│   ├── [drwxr-xr-x  4.0K]  rc.d/
-│   │   └── [drwxr-xr-x  4.0K]  init.d/
-│   │       ├── [-rwxr-xr-x  1.7K]  mcstrans*
-│   │       └── [-rwxr-xr-x  1.8K]  restorecond*
-│   ├── [drwxr-xr-x  4.0K]  selinux/
-│   │   ├── [-rw-r--r--   118]  restorecond.conf
-│   │   ├── [-rw-r--r--    93]  restorecond_user.conf
-│   │   └── [-rw-r--r--  1.9K]  semanage.conf
-│   ├── [-rw-r--r--   216]  sestatus.conf
-│   ├── [drwxr-xr-x  4.0K]  sysconfig/
-│   │   └── [-rw-r--r--    85]  sandbox
-│   └── [drwxr-xr-x  4.0K]  xdg/
-│       └── [drwxr-xr-x  4.0K]  autostart/
-│           └── [-rw-r--r--   222]  restorecond.desktop
-├── [drwxr-xr-x  4.0K]  usr/
-│   ├── [drwxr-xr-x  4.0K]  bin/
-│   │   ├── [-rwxr-xr-x   15K]  audit2allow*
-│   │   ├── [lrwxrwxrwx    11]  audit2why -> audit2allow*
-│   │   ├── [-rwxr-xr-x   14K]  chcat*
-│   │   ├── [-rwxr-xr-x  443K]  checkmodule*
-│   │   ├── [-rwxr-xr-x  515K]  checkpolicy*
-│   │   ├── [-rwxr-xr-x   15K]  chkcon*
-│   │   ├── [-r-xr-xr-x   31K]  newrole*
-│   │   ├── [-rwxr-xr-x   18K]  sandbox*
-│   │   ├── [-rwxr-xr-x   15K]  secil2conf*
-│   │   ├── [-rwxr-xr-x   15K]  secil2tree*
-│   │   ├── [-rwxr-xr-x   27K]  secilc*
-│   │   ├── [-rwxr-xr-x   28K]  secon*
-│   │   ├── [-rwxr-xr-x   33K]  selinux-polgengui*
-│   │   ├── [-rwxr-xr-x   15K]  semodule_expand*
-│   │   ├── [-rwxr-xr-x   15K]  semodule_link*
-│   │   ├── [-rwxr-xr-x   15K]  semodule_package*
-│   │   ├── [-rwxr-xr-x   15K]  semodule_unpackage*
-│   │   ├── [-rwxr-xr-x   15K]  sepol_check_access*
-│   │   ├── [-rwxr-xr-x   15K]  sepol_compute_av*
-│   │   ├── [-rwxr-xr-x   15K]  sepol_compute_member*
-│   │   ├── [-rwxr-xr-x   15K]  sepol_compute_relabel*
-│   │   ├── [-rwxr-xr-x   15K]  sepol_validate_transition*
-│   │   ├── [lrwxrwxrwx     8]  sepolgen -> sepolicy*
-│   │   ├── [-rwxr-xr-x  4.2K]  sepolgen-ifgen*
-│   │   ├── [-rwxr-xr-x  235K]  sepolgen-ifgen-attr-helper*
-│   │   ├── [-rwxr-xr-x   29K]  sepolicy*
-│   │   ├── [-rwxr-xr-x   23K]  sestatus*
-│   │   └── [-rwxr-xr-x    90]  system-config-selinux*
-│   ├── [drwxr-xr-x  4.0K]  include/
-│   │   ├── [drwxr-xr-x  4.0K]  selinux/
-│   │   │   ├── [-rw-r--r--   16K]  avc.h
-│   │   │   ├── [-rw-r--r--  1.2K]  context.h
-│   │   │   ├── [-rw-r--r--  2.9K]  get_context_list.h
-│   │   │   ├── [-rw-r--r--   643]  get_default_type.h
-│   │   │   ├── [-rw-r--r--  6.3K]  label.h
-│   │   │   ├── [-rw-r--r--  7.3K]  restorecon.h
-│   │   │   └── [-rw-r--r--   28K]  selinux.h
-│   │   ├── [drwxr-xr-x  4.0K]  semanage/
-│   │   │   ├── [-rw-r--r--  1.6K]  boolean_record.h
-│   │   │   ├── [-rw-r--r--  1.0K]  booleans_active.h
-│   │   │   ├── [-rw-r--r--  1.1K]  booleans_local.h
-│   │   │   ├── [-rw-r--r--   820]  booleans_policy.h
-│   │   │   ├── [-rw-r--r--  1.8K]  context_record.h
-│   │   │   ├── [-rw-r--r--  1.8K]  debug.h
-│   │   │   ├── [-rw-r--r--  2.4K]  fcontext_record.h
-│   │   │   ├── [-rw-r--r--  1.2K]  fcontexts_local.h
-│   │   │   ├── [-rw-r--r--  1020]  fcontexts_policy.h
-│   │   │   ├── [-rw-r--r--  7.3K]  handle.h
-│   │   │   ├── [-rw-r--r--  2.1K]  ibendport_record.h
-│   │   │   ├── [-rw-r--r--  1.2K]  ibendports_local.h
-│   │   │   ├── [-rw-r--r--   896]  ibendports_policy.h
-│   │   │   ├── [-rw-r--r--  2.4K]  ibpkey_record.h
-│   │   │   ├── [-rw-r--r--  1.1K]  ibpkeys_local.h
-│   │   │   ├── [-rw-r--r--   829]  ibpkeys_policy.h
-│   │   │   ├── [-rw-r--r--  1.9K]  iface_record.h
-│   │   │   ├── [-rw-r--r--  1.1K]  interfaces_local.h
-│   │   │   ├── [-rw-r--r--   834]  interfaces_policy.h
-│   │   │   ├── [-rw-r--r--  9.9K]  modules.h
-│   │   │   ├── [-rw-r--r--  2.8K]  node_record.h
-│   │   │   ├── [-rw-r--r--  1.1K]  nodes_local.h
-│   │   │   ├── [-rw-r--r--   811]  nodes_policy.h
-│   │   │   ├── [-rw-r--r--  2.1K]  port_record.h
-│   │   │   ├── [-rw-r--r--  1.1K]  ports_local.h
-│   │   │   ├── [-rw-r--r--   811]  ports_policy.h
-│   │   │   ├── [-rw-r--r--  2.1K]  semanage.h
-│   │   │   ├── [-rw-r--r--  1.9K]  seuser_record.h
-│   │   │   ├── [-rw-r--r--  1.1K]  seusers_local.h
-│   │   │   ├── [-rw-r--r--   835]  seusers_policy.h
-│   │   │   ├── [-rw-r--r--  2.7K]  user_record.h
-│   │   │   ├── [-rw-r--r--  1.1K]  users_local.h
-│   │   │   └── [-rw-r--r--   811]  users_policy.h
-│   │   └── [drwxr-xr-x  4.0K]  sepol/
-│   │       ├── [-rw-r--r--  1.5K]  boolean_record.h
-│   │       ├── [-rw-r--r--  1.3K]  booleans.h
-│   │       ├── [drwxr-xr-x  4.0K]  cil/
-│   │       │   └── [-rw-r--r--  3.7K]  cil.h
-│   │       ├── [-rw-r--r--   752]  context.h
-│   │       ├── [-rw-r--r--  1.6K]  context_record.h
-│   │       ├── [-rw-r--r--   975]  debug.h
-│   │       ├── [-rw-r--r--   826]  errcodes.h
-│   │       ├── [-rw-r--r--  1.4K]  handle.h
-│   │       ├── [-rw-r--r--  2.1K]  ibendport_record.h
-│   │       ├── [-rw-r--r--  1.4K]  ibendports.h
-│   │       ├── [-rw-r--r--  2.2K]  ibpkey_record.h
-│   │       ├── [-rw-r--r--  1.3K]  ibpkeys.h
-│   │       ├── [-rw-r--r--  1.8K]  iface_record.h
-│   │       ├── [-rw-r--r--  1.4K]  interfaces.h
-│   │       ├── [-rw-r--r--   125]  kernel_to_cil.h
-│   │       ├── [-rw-r--r--   126]  kernel_to_conf.h
-│   │       ├── [-rw-r--r--  2.6K]  module.h
-│   │       ├── [-rw-r--r--   329]  module_to_cil.h
-│   │       ├── [-rw-r--r--  2.7K]  node_record.h
-│   │       ├── [-rw-r--r--  1.3K]  nodes.h
-│   │       ├── [drwxr-xr-x  4.0K]  policydb/
-│   │       │   ├── [-rw-r--r--  1.6K]  avrule_block.h
-│   │       │   ├── [-rw-r--r--  4.7K]  avtab.h
-│   │       │   ├── [-rw-r--r--  4.7K]  conditional.h
-│   │       │   ├── [-rw-r--r--  2.5K]  constraint.h
-│   │       │   ├── [-rw-r--r--  3.5K]  context.h
-│   │       │   ├── [-rw-r--r--  3.5K]  ebitmap.h
-│   │       │   ├── [-rw-r--r--  3.6K]  expand.h
-│   │       │   ├── [-rw-r--r--  1.5K]  flask_types.h
-│   │       │   ├── [-rw-r--r--  3.3K]  hashtab.h
-│   │       │   ├── [-rw-r--r--  1.8K]  hierarchy.h
-│   │       │   ├── [-rw-r--r--   517]  link.h
-│   │       │   ├── [-rw-r--r--  5.0K]  mls_types.h
-│   │       │   ├── [-rw-r--r--  1.5K]  module.h
-│   │       │   ├── [-rw-r--r--   772]  polcaps.h
-│   │       │   ├── [-rw-r--r--   26K]  policydb.h
-│   │       │   ├── [-rw-r--r--  8.5K]  services.h
-│   │       │   ├── [-rw-r--r--  1.9K]  sidtab.h
-│   │       │   ├── [-rw-r--r--  1.1K]  symtab.h
-│   │       │   └── [-rw-r--r--  1.5K]  util.h
-│   │       ├── [-rw-r--r--  4.7K]  policydb.h
-│   │       ├── [-rw-r--r--  2.0K]  port_record.h
-│   │       ├── [-rw-r--r--  1.3K]  ports.h
-│   │       ├── [-rw-r--r--   862]  sepol.h
-│   │       ├── [-rw-r--r--  2.3K]  user_record.h
-│   │       └── [-rw-r--r--  1.3K]  users.h
-│   ├── [drwxr-xr-x  4.0K]  lib/
-│   │   ├── [drwxr-xr-x  4.0K]  python3/
-│   │   │   └── [drwxr-xr-x  4.0K]  site-packages/
-│   │   │       ├── [-rw-r--r--  105K]  seobject.py
-│   │   │       ├── [drwxr-xr-x  4.0K]  sepolgen/
-│   │   │       │   ├── [-rw-r--r--     0]  __init__.py
-│   │   │       │   ├── [-rw-r--r--   12K]  access.py
-│   │   │       │   ├── [-rw-r--r--   21K]  audit.py
-│   │   │       │   ├── [-rw-r--r--  2.8K]  classperms.py
-│   │   │       │   ├── [-rw-r--r--  2.8K]  defaults.py
-│   │   │       │   ├── [-rw-r--r--   16K]  interfaces.py
-│   │   │       │   ├── [-rw-r--r--   42K]  lex.py
-│   │   │       │   ├── [-rw-r--r--  8.5K]  matching.py
-│   │   │       │   ├── [-rw-r--r--  7.1K]  module.py
-│   │   │       │   ├── [-rw-r--r--  6.4K]  objectmodel.py
-│   │   │       │   ├── [-rw-r--r--  5.0K]  output.py
-│   │   │       │   ├── [-rw-r--r--   15K]  policygen.py
-│   │   │       │   ├── [-rw-r--r--   31K]  refparser.py
-│   │   │       │   ├── [-rw-r--r--   31K]  refpolicy.py
-│   │   │       │   ├── [-rw-r--r--  1013]  sepolgeni18n.py
-│   │   │       │   ├── [-rw-r--r--  5.4K]  util.py
-│   │   │       │   └── [-rw-r--r--  134K]  yacc.py
-│   │   │       ├── [drwxr-xr-x  4.0K]  sepolicy/
-│   │   │       │   ├── [-rw-r--r--   37K]  __init__.py
-│   │   │       │   ├── [drwxr-xr-x  4.0K]  __pycache__/
-│   │   │       │   │   ├── [-rw-r--r--   54K]  __init__.cpython-312.pyc
-│   │   │       │   │   ├── [-rw-r--r--  1.6K]  booleans.cpython-312.pyc
-│   │   │       │   │   ├── [-rw-r--r--  2.1K]  communicate.cpython-312.pyc
-│   │   │       │   │   ├── [-rw-r--r--   79K]  generate.cpython-312.pyc
-│   │   │       │   │   ├── [-rw-r--r--  182K]  gui.cpython-312.pyc
-│   │   │       │   │   ├── [-rw-r--r--   10K]  interface.cpython-312.pyc
-│   │   │       │   │   ├── [-rw-r--r--   55K]  manpage.cpython-312.pyc
-│   │   │       │   │   ├── [-rw-r--r--  2.8K]  network.cpython-312.pyc
-│   │   │       │   │   ├── [-rw-r--r--  3.0K]  sedbus.cpython-312.pyc
-│   │   │       │   │   └── [-rw-r--r--  5.0K]  transition.cpython-312.pyc
-│   │   │       │   ├── [-rw-r--r--  1.5K]  booleans.py
-│   │   │       │   ├── [-rw-r--r--  1.7K]  communicate.py
-│   │   │       │   ├── [-rw-r--r--   50K]  generate.py
-│   │   │       │   ├── [-rw-r--r--  131K]  gui.py
-│   │   │       │   ├── [-rw-r--r--  8.0K]  interface.py
-│   │   │       │   ├── [-rw-r--r--   39K]  manpage.py
-│   │   │       │   ├── [-rw-r--r--  2.7K]  network.py
-│   │   │       │   ├── [-rw-r--r--  1.5K]  sedbus.py
-│   │   │       │   ├── [-rw-r--r--  307K]  sepolicy.glade
-│   │   │       │   ├── [drwxr-xr-x  4.0K]  templates/
-│   │   │       │   │   ├── [-rw-r--r--   724]  __init__.py
-│   │   │       │   │   ├── [drwxr-xr-x  4.0K]  __pycache__/
-│   │   │       │   │   │   ├── [-rw-r--r--   162]  __init__.cpython-312.pyc
-│   │   │       │   │   │   ├── [-rw-r--r--   334]  boolean.cpython-312.pyc
-│   │   │       │   │   │   ├── [-rw-r--r--  2.8K]  etc_rw.cpython-312.pyc
-│   │   │       │   │   │   ├── [-rw-r--r--  8.9K]  executable.cpython-312.pyc
-│   │   │       │   │   │   ├── [-rw-r--r--   13K]  network.cpython-312.pyc
-│   │   │       │   │   │   ├── [-rw-r--r--  2.9K]  rw.cpython-312.pyc
-│   │   │       │   │   │   ├── [-rw-r--r--  3.4K]  script.cpython-312.pyc
-│   │   │       │   │   │   ├── [-rw-r--r--   476]  semodule.cpython-312.pyc
-│   │   │       │   │   │   ├── [-rw-r--r--  2.4K]  spec.cpython-312.pyc
-│   │   │       │   │   │   ├── [-rw-r--r--  2.9K]  test_module.cpython-312.pyc
-│   │   │       │   │   │   ├── [-rw-r--r--  2.6K]  tmp.cpython-312.pyc
-│   │   │       │   │   │   ├── [-rw-r--r--  1.2K]  unit_file.cpython-312.pyc
-│   │   │       │   │   │   ├── [-rw-r--r--  3.6K]  user.cpython-312.pyc
-│   │   │       │   │   │   ├── [-rw-r--r--  3.1K]  var_cache.cpython-312.pyc
-│   │   │       │   │   │   ├── [-rw-r--r--  3.2K]  var_lib.cpython-312.pyc
-│   │   │       │   │   │   ├── [-rw-r--r--  2.2K]  var_log.cpython-312.pyc
-│   │   │       │   │   │   ├── [-rw-r--r--  2.1K]  var_run.cpython-312.pyc
-│   │   │       │   │   │   └── [-rw-r--r--  3.0K]  var_spool.cpython-312.pyc
-│   │   │       │   │   ├── [-rw-r--r--  1.2K]  boolean.py
-│   │   │       │   │   ├── [-rw-r--r--  3.8K]  etc_rw.py
-│   │   │       │   │   ├── [-rw-r--r--  9.7K]  executable.py
-│   │   │       │   │   ├── [-rw-r--r--   13K]  network.py
-│   │   │       │   │   ├── [-rw-r--r--  3.8K]  rw.py
-│   │   │       │   │   ├── [-rw-r--r--  4.2K]  script.py
-│   │   │       │   │   ├── [-rw-r--r--  1.3K]  semodule.py
-│   │   │       │   │   ├── [-rw-r--r--  2.2K]  spec.py
-│   │   │       │   │   ├── [-rw-r--r--  4.3K]  test_module.py
-│   │   │       │   │   ├── [-rw-r--r--  3.4K]  tmp.py
-│   │   │       │   │   ├── [-rw-r--r--  2.2K]  unit_file.py
-│   │   │       │   │   ├── [-rw-r--r--  4.3K]  user.py
-│   │   │       │   │   ├── [-rw-r--r--  4.1K]  var_cache.py
-│   │   │       │   │   ├── [-rw-r--r--  4.2K]  var_lib.py
-│   │   │       │   │   ├── [-rw-r--r--  3.2K]  var_log.py
-│   │   │       │   │   ├── [-rw-r--r--  2.9K]  var_run.py
-│   │   │       │   │   └── [-rw-r--r--  4.0K]  var_spool.py
-│   │   │       │   └── [-rw-r--r--  3.1K]  transition.py
-│   │   │       └── [drwxr-xr-x  4.0K]  sepolicy-3.6.dist-info/
-│   │   │           ├── [-rw-r--r--     4]  INSTALLER
-│   │   │           ├── [-rw-r--r--   207]  METADATA
-│   │   │           ├── [-rw-r--r--  9.8K]  RECORD
-│   │   │           ├── [-rw-r--r--     0]  REQUESTED
-│   │   │           ├── [-rw-r--r--    91]  WHEEL
-│   │   │           ├── [-rw-r--r--    54]  direct_url.json
-│   │   │           └── [-rw-r--r--     9]  top_level.txt
-│   │   └── [drwxr-xr-x  4.0K]  systemd/
-│   │       ├── [drwxr-xr-x  4.0K]  system/
-│   │       │   ├── [-rw-r--r--   353]  mcstrans.service
-│   │       │   └── [-rw-r--r--   292]  restorecond.service
-│   │       └── [drwxr-xr-x  4.0K]  user/
-│   │           └── [-rw-r--r--   277]  restorecond_user.service
-│   ├── [drwxr-xr-x  4.0K]  lib64/
-│   │   ├── [-rw-r--r--  410K]  libselinux.a
-│   │   ├── [lrwxrwxrwx    15]  libselinux.so -> libselinux.so.1*
-│   │   ├── [-rwxr-xr-x  180K]  libselinux.so.1*
-│   │   ├── [-rw-r--r--  567K]  libsemanage.a
-│   │   ├── [lrwxrwxrwx    16]  libsemanage.so -> libsemanage.so.2*
-│   │   ├── [-rwxr-xr-x  268K]  libsemanage.so.2*
-│   │   ├── [-rw-r--r--  1.5M]  libsepol.a
-│   │   ├── [lrwxrwxrwx    13]  libsepol.so -> libsepol.so.2*
-│   │   ├── [-rwxr-xr-x  772K]  libsepol.so.2*
-│   │   ├── [drwxr-xr-x  4.0K]  pkgconfig/
-│   │   │   ├── [-rw-r--r--   276]  libselinux.pc
-│   │   │   ├── [-rw-r--r--   301]  libsemanage.pc
-│   │   │   └── [-rw-r--r--   233]  libsepol.pc
-│   │   └── [drwxr-xr-x  4.0K]  python3/
-│   │       └── [drwxr-xr-x  4.0K]  site-packages/
-│   │           ├── [lrwxrwxrwx    31]  _selinux.cpython-312.so -> selinux/_selinux.cpython-312.so*
-│   │           ├── [-rwxr-xr-x  303K]  _semanage.cpython-312.so*
-│   │           ├── [drwxr-xr-x  4.0K]  selinux/
-│   │           │   ├── [-rw-r--r--   38K]  __init__.py
-│   │           │   ├── [-rwxr-xr-x  263K]  _selinux.cpython-312.so*
-│   │           │   └── [-rwxr-xr-x  243K]  audit2why.cpython-312.so*
-│   │           ├── [drwxr-xr-x  4.0K]  selinux-3.6.dist-info/
-│   │           │   ├── [-rw-r--r--     4]  INSTALLER
-│   │           │   ├── [-rw-r--r--   201]  METADATA
-│   │           │   ├── [-rw-r--r--   742]  RECORD
-│   │           │   ├── [-rw-r--r--     0]  REQUESTED
-│   │           │   ├── [-rw-r--r--   104]  WHEEL
-│   │           │   ├── [-rw-r--r--    53]  direct_url.json
-│   │           │   └── [-rw-r--r--     8]  top_level.txt
-│   │           └── [-rw-r--r--   38K]  semanage.py
-│   ├── [drwxr-xr-x  4.0K]  libexec/
-│   │   └── [drwxr-xr-x  4.0K]  selinux/
-│   │       ├── [drwxr-xr-x  4.0K]  hll/
-│   │       │   └── [-rwxr-xr-x   15K]  pp*
-│   │       └── [-rwxr-xr-x  9.0K]  semanage_migrate_store*
-│   ├── [drwxr-xr-x  4.0K]  sbin/
-│   │   ├── [-rwxr-xr-x   15K]  avcstat*
-│   │   ├── [-rwxr-xr-x   15K]  compute_av*
-│   │   ├── [-rwxr-xr-x   15K]  compute_create*
-│   │   ├── [-rwxr-xr-x   15K]  compute_member*
-│   │   ├── [-rwxr-xr-x   15K]  compute_relabel*
-│   │   ├── [-rwxr-xr-x   12K]  fixfiles*
-│   │   ├── [lrwxrwxrwx     8]  genhomedircon -> semodule*
-│   │   ├── [-rwxr-xr-x   15K]  getconlist*
-│   │   ├── [-rwxr-xr-x   15K]  getdefaultcon*
-│   │   ├── [-rwxr-xr-x   15K]  getenforce*
-│   │   ├── [-rwxr-xr-x   15K]  getfilecon*
-│   │   ├── [-rwxr-xr-x   15K]  getpidcon*
-│   │   ├── [-rwxr-xr-x   15K]  getpidprevcon*
-│   │   ├── [-rwxr-xr-x   15K]  getpolicyload*
-│   │   ├── [-rwxr-xr-x   15K]  getsebool*
-│   │   ├── [-rwxr-xr-x   15K]  getseuser*
-│   │   ├── [-rwxr-xr-x   15K]  load_policy*
-│   │   ├── [-rwxr-xr-x   15K]  matchpathcon*
-│   │   ├── [-rwxr-xr-x  239K]  mcstransd*
-│   │   ├── [-rwxr-xr-x   15K]  open_init_pty*
-│   │   ├── [-rwxr-xr-x   15K]  policyvers*
-│   │   ├── [lrwxrwxrwx     8]  restorecon -> setfiles*
-│   │   ├── [-rwxr-xr-x   15K]  restorecon_xattr*
-│   │   ├── [-rwxr-xr-x   27K]  restorecond*
-│   │   ├── [-rwxr-xr-x   15K]  run_init*
-│   │   ├── [-rwxr-xr-x   75K]  sefcontext_compile*
-│   │   ├── [-rwxr-xr-x   15K]  selabel_digest*
-│   │   ├── [-rwxr-xr-x   15K]  selabel_get_digests_all_partial_matches*
-│   │   ├── [-rwxr-xr-x   15K]  selabel_lookup*
-│   │   ├── [-rwxr-xr-x   15K]  selabel_lookup_best_match*
-│   │   ├── [-rwxr-xr-x   15K]  selabel_partial_match*
-│   │   ├── [-rwxr-xr-x   15K]  selinux_check_access*
-│   │   ├── [-rwxr-xr-x   15K]  selinux_check_securetty_context*
-│   │   ├── [-rwxr-xr-x   15K]  selinuxenabled*
-│   │   ├── [-rwxr-xr-x   15K]  selinuxexeccon*
-│   │   ├── [-rwxr-xr-x   41K]  semanage*
-│   │   ├── [-rwxr-xr-x   27K]  semodule*
-│   │   ├── [lrwxrwxrwx    15]  sestatus -> ../bin/sestatus*
-│   │   ├── [-rwxr-xr-x   15K]  setenforce*
-│   │   ├── [-rwxr-xr-x   15K]  setfilecon*
-│   │   ├── [-rwxr-xr-x   23K]  setfiles*
-│   │   ├── [-rwxr-xr-x   19K]  setsebool*
-│   │   ├── [-rwsr-xr-x   31K]  seunshare*
-│   │   ├── [-rwxr-xr-x   15K]  togglesebool*
-│   │   └── [-rwxr-xr-x   15K]  validatetrans*
-│   └── [drwxr-xr-x  4.0K]  share/
-│       ├── [drwxr-xr-x  4.0K]  polkit-1/
-│       │   └── [drwxr-xr-x  4.0K]  actions/
-│       │       ├── [-rw-r--r--   928]  org.selinux.config.policy
-│       │       └── [-rw-r--r--  3.2K]  org.selinux.policy
-│       ├── [drwxr-xr-x  4.0K]  sandbox/
-│       │   ├── [-rwxr-xr-x   991]  sandboxX.sh*
-│       │   └── [-rwxr-xr-x   250]  start*
-│       └── [drwxr-xr-x  4.0K]  system-config-selinux/
-│           ├── [-rw-r--r--  7.8K]  booleansPage.py
-│           ├── [-rw-r--r--  5.1K]  domainsPage.py
-│           ├── [-rw-r--r--  8.4K]  fcontextPage.py
-│           ├── [-rw-r--r--  6.8K]  loginsPage.py
-│           ├── [-rw-r--r--  6.8K]  modulesPage.py
-│           ├── [-rw-r--r--  137K]  polgen.ui
-│           ├── [-rw-r--r--   10K]  portsPage.py
-│           ├── [-rwxr-xr-x  6.4K]  selinux_server.py*
-│           ├── [-rw-r--r--  5.3K]  semanagePage.py
-│           ├── [-rw-r--r--  7.6K]  statusPage.py
-│           ├── [-rw-r--r--  1.4K]  system-config-selinux.png
-│           ├── [-rwxr-xr-x  6.1K]  system-config-selinux.py*
-│           ├── [-rw-r--r--  100K]  system-config-selinux.ui
-│           └── [-rw-r--r--  5.3K]  usersPage.py
-└── [drwxr-xr-x  4.0K]  var/
-    └── [drwxr-xr-x  4.0K]  lib/
-        └── [drwxr-xr-x  4.0K]  sepolgen/
-            └── [-rw-r--r--   33K]  perm_map
+└── [drwxr-xr-x     6]  usr
+    ├── [drwxr-xr-x     3]  include
+    │   └── [drwxr-xr-x     9]  selinux
+    │       ├── [-rw-r--r--   16K]  avc.h
+    │       ├── [-rw-r--r--  1.2K]  context.h
+    │       ├── [-rw-r--r--  2.9K]  get_context_list.h
+    │       ├── [-rw-r--r--   643]  get_default_type.h
+    │       ├── [-rw-r--r--  6.3K]  label.h
+    │       ├── [-rw-r--r--  7.3K]  restorecon.h
+    │       └── [-rw-r--r--   29K]  selinux.h
+    ├── [drwxr-xr-x     7]  lib64
+    │   ├── [-rw-r--r--  444K]  libselinux.a
+    │   ├── [lrwxrwxrwx    15]  libselinux.so -> libselinux.so.1
+    │   ├── [-rwxr-xr-x  196K]  libselinux.so.1
+    │   ├── [drwxr-xr-x     3]  pkgconfig
+    │   │   └── [-rw-r--r--   276]  libselinux.pc
+    │   └── [drwxr-xr-x     3]  python3
+    │       └── [drwxr-xr-x     5]  site-packages
+    │           ├── [lrwxrwxrwx    31]  _selinux.cpython-312.so ->                         ↵
+selinux/_selinux.cpython-312.so
+    │           ├── [drwxr-xr-x     5]  selinux
+    │           │   ├── [-rw-r--r--   38K]  __init__.py
+    │           │   ├── [-rwxr-xr-x  267K]  _selinux.cpython-312.so
+    │           │   └── [-rwxr-xr-x  247K]  audit2why.cpython-312.so
+    │           └── [drwxr-xr-x     9]  selinux-3.8.dist-info
+    │               ├── [-rw-r--r--     4]  INSTALLER
+    │               ├── [-rw-r--r--   201]  METADATA
+    │               ├── [-rw-r--r--   743]  RECORD
+    │               ├── [-rw-r--r--     0]  REQUESTED
+    │               ├── [-rw-r--r--   104]  WHEEL
+    │               ├── [-rw-r--r--    53]  direct_url.json
+    │               └── [-rw-r--r--     8]  top_level.txt
+    ├── [drwxr-xr-x    33]  sbin
+    │   ├── [-rwxr-xr-x   15K]  avcstat
+    │   ├── [-rwxr-xr-x   15K]  compute_av
+    │   ├── [-rwxr-xr-x   15K]  compute_create
+    │   ├── [-rwxr-xr-x   15K]  compute_member
+    │   ├── [-rwxr-xr-x   15K]  compute_relabel
+    │   ├── [-rwxr-xr-x   15K]  getconlist
+    │   ├── [-rwxr-xr-x   15K]  getdefaultcon
+    │   ├── [-rwxr-xr-x   15K]  getenforce
+    │   ├── [-rwxr-xr-x   15K]  getfilecon
+    │   ├── [-rwxr-xr-x   15K]  getpidcon
+    │   ├── [-rwxr-xr-x   15K]  getpidprevcon
+    │   ├── [-rwxr-xr-x   15K]  getpolicyload
+    │   ├── [-rwxr-xr-x   15K]  getsebool
+    │   ├── [-rwxr-xr-x   15K]  getseuser
+    │   ├── [-rwxr-xr-x   15K]  matchpathcon
+    │   ├── [-rwxr-xr-x   15K]  policyvers
+    │   ├── [-rwxr-xr-x  115K]  sefcontext_compile
+    │   ├── [-rwxr-xr-x   15K]  selabel_compare
+    │   ├── [-rwxr-xr-x   15K]  selabel_digest
+    │   ├── [-rwxr-xr-x   15K]  selabel_get_digests_all_partial_matches
+    │   ├── [-rwxr-xr-x   15K]  selabel_lookup
+    │   ├── [-rwxr-xr-x   15K]  selabel_lookup_best_match
+    │   ├── [-rwxr-xr-x   15K]  selabel_partial_match
+    │   ├── [-rwxr-xr-x   15K]  selinux_check_access
+    │   ├── [-rwxr-xr-x   15K]  selinux_check_securetty_context
+    │   ├── [-rwxr-xr-x   15K]  selinuxenabled
+    │   ├── [-rwxr-xr-x   15K]  selinuxexeccon
+    │   ├── [-rwxr-xr-x   15K]  setenforce
+    │   ├── [-rwxr-xr-x   15K]  setfilecon
+    │   ├── [-rwxr-xr-x   15K]  togglesebool
+    │   └── [-rwxr-xr-x   15K]  validatetrans
+    └── [drwxr-xr-x     2]  share
 
-49 directories, 300 files
+12 directories, 53 files
 ```
diff --git a/images/packages/selinux/werf.inc.yaml b/images/packages/selinux/werf.inc.yaml
index 34fb101f30..ec7b36bb94 100644
--- a/images/packages/selinux/werf.inc.yaml
+++ b/images/packages/selinux/werf.inc.yaml
@@ -44,13 +44,12 @@ altPackages:
 - python3-module-wheel
 - python3-module-distro
 - ruby-devel
-- libgio-devel
-- libustr-devel libustr 
+- libustr-devel libustr
 - policycoreutils-restorecond policycoreutils
 - tree
 packages:
 - libaudit
-- glib2 bzip2
+- util-linux bzip2
 - pcre2
 - libcap libcap-ng
 {{- end -}}
@@ -87,7 +86,8 @@ shell:
     cd /src
     OUTDIR=/out
 
-    make -j$(nproc) clean distclean
+    cd libselinux
+    # make -j$(nproc)
 
     make -j$(nproc) \
       DESTDIR=$OUTDIR \
diff --git a/images/packages/swtpm/werf.inc.yaml b/images/packages/swtpm/werf.inc.yaml
index 337a89076a..cb9833aff5 100644
--- a/images/packages/swtpm/werf.inc.yaml
+++ b/images/packages/swtpm/werf.inc.yaml
@@ -33,14 +33,15 @@ altPackages:
 - cryptote
 - net-tools softhsm
 - tpm2-pkcs11 tpm2-pkcs11-tools tpm2-tools tpm2-abrmd
-- glib2-devel libgnutls-openssl-devel
-- libgnutls30 libfuse-devel libgnutls-devel gnutls-utils
+- libgnutls-openssl-devel
+- libfuse-devel
 - libseccomp-devel libseccomp
 - perl-podlators
-- glib2-devel libgio-devel
 packages:
 - libgmp libtpms openssl libjson-glib
 - libtasn1
+- glib2 util-linux
+- gnutls
 - libunistring
 {{- end -}}
 
diff --git a/images/qemu/werf.inc.yaml b/images/qemu/werf.inc.yaml
index 03fa2c74fa..c74b133e48 100644
--- a/images/qemu/werf.inc.yaml
+++ b/images/qemu/werf.inc.yaml
@@ -32,9 +32,9 @@ shell:
   {{- include "alt packages clean" . | nindent 2}}
   install:
   - |
-    git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /{{ $gitRepoName }}-{{ $version }}
+    git clone --depth=1 $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} --branch {{ $version }} /src/{{ $gitRepoName }}-{{ $version }}
 
-    cd /{{ $gitRepoName }}-{{ $version }}
+    cd /src/{{ $gitRepoName }}-{{ $version }}
 
     if [[ "$(cat /run/secrets/SOURCE_REPO)" =~ "github.com" ]] ; then
       echo "Checkout submodules"
@@ -105,7 +105,7 @@ altLibraries:
 - libalsa-devel libpulseaudio-devel
 - pipewire-libs pipewire-jack-libs-devel
 - libsoundio-devel
-- libjpeg-devel libxkbcommon-devel xkeyboard-config-devel
+- libjpeg-devel xkeyboard-config-devel
 - glusterfs11 libgtk+3-devel libvte libvte-devel libvte3-devel
 - libvirglrenderer-devel libusb-devel libbpf-devel
 - libspice-server-devel spice-protocol ceph-devel
@@ -118,7 +118,6 @@ altLibraries:
 - libvitastor-devel libiscsi-devel glusterfs-coreutils
 - libglusterfs11-api-devel
 - libvdeplug-devel
-- glib2-devel
 packages:
 - dmidecode libgcrypt nettle libcap-ng libcapstone
 - openssl libcurl e2fsprogs libxcrypt numactl
@@ -133,6 +132,9 @@ packages:
 - linux-pam
 - snappy
 - ngtcp2 libtasn1 ncurses
+- glib2 util-linux
+- libxkbcommon
+- libgcc1
 - libaio
 - liburing libuserspace-rcu libunistring systemd
 - multipath-tools
@@ -145,7 +147,7 @@ final: false
 fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/alt" "builder/alt-go-svace" }}
 import:
 - image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
-  add: /{{ $gitRepoName }}-{{ $version }}
+  add: /src/{{ $gitRepoName }}-{{ $version }}
   to: /{{ $gitRepoName }}-{{ $version }}
   before: install
 - image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
diff --git a/images/virt-launcher/mount-points.yaml b/images/virt-launcher/mount-points.yaml
index 643cfdb1fe..f07fda66e1 100644
--- a/images/virt-launcher/mount-points.yaml
+++ b/images/virt-launcher/mount-points.yaml
@@ -43,6 +43,6 @@ dirs:
   - /var/lib/libvirt/qemu/nvram
   - /var/lib/kubevirt-node-labeller
   - /var/lib/swtpm-localca
-  - /var/log
+  - /var/log/libvirt
   - /path # For hot-plugged disks, used in "hp Pods".
   - /init/usr/bin # For attaching images as "container disks".
diff --git a/images/virt-launcher/werf.inc.yaml b/images/virt-launcher/werf.inc.yaml
index 487d8bef3b..0d03e69fbe 100644
--- a/images/virt-launcher/werf.inc.yaml
+++ b/images/virt-launcher/werf.inc.yaml
@@ -39,7 +39,6 @@ altLibs:
   - libsoundio-devel
   - libjpeg-devel
   - libpng-devel
-  - libxkbcommon-devel
   - xkeyboard-config-devel
   - libgtk+3-devel
   - libvte
@@ -78,8 +77,6 @@ altLibs:
   - libfuse-devel
   - libsystemd-devel
   - systemtap-sdt-devel
-  - glib2-devel
-  - libgio-devel
   - libclocale
   - libLLVMSPIRVLib-devel
   - ethtool
@@ -129,6 +126,8 @@ packages:
 - cyrus-sasl2
 - snappy
 - libtasn1 libtirpc
+- glib2
+- libxkbcommon
 - libaio
 - liburing libunistring
 {{- end -}}
@@ -450,7 +449,7 @@ shell:
 ---
 image: {{ .ModuleNamePrefix }}{{ .ImageName }}-cbuilder
 final: false
-fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.23" "builder/alt-go-svace" }}
+fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/golang-bookworm-1.24" "builder/alt-go-svace" }}
 git:
   - add: {{ .ModuleDir }}/images/{{ .ImageName }}/static_binaries
     to: /static_binaries
diff --git a/images/virtualization-artifact/Taskfile.yaml b/images/virtualization-artifact/Taskfile.yaml
index 6724b73dd4..2fe117d704 100644
--- a/images/virtualization-artifact/Taskfile.yaml
+++ b/images/virtualization-artifact/Taskfile.yaml
@@ -72,7 +72,7 @@ tasks:
     deps:
       - _ensure:mirrord
     cmd: |
-      ./hack/mirrord.sh run --app=$PWD/cmd/virtualization-controller/main.go \
+      TMPDIR=/tmp ./hack/mirrord.sh run --app=$PWD/cmd/virtualization-controller/main.go \
       --deployment=virtualization-controller                                 \
       --namespace={{ .BaseNamespace }}                                       \
       --container-name=virtualization-controller
@@ -92,15 +92,15 @@ tasks:
       flags+=( "--kubevirt-cabundle=/etc/virt-api/certificates/ca.crt" )
       flags+=( "--kubevirt-endpoint=virt-api.{{ .BaseNamespace }}.svc" )
       flags+=( "--secure-port=8443" )
-      flags+=( "--tls-private-key-file=/etc/virtualziation-api/certificates/tls.key" )
-      flags+=( "--tls-cert-file=/etc/virtualziation-api/certificates/tls.crt" )
+      flags+=( "--tls-private-key-file=/etc/virtualization-api/certificates/tls.key" )
+      flags+=( "--tls-cert-file=/etc/virtualization-api/certificates/tls.crt" )
       flags+=( "--v=7" )
-      flags+=( "--proxy-client-cert-file=/etc/virtualziation-api-proxy/certificates/tls.crt" )
-      flags+=( "--proxy-client-key-file=/etc/virtualziation-api-proxy/certificates/tls.key" )
+      flags+=( "--proxy-client-cert-file=/etc/virtualization-api-proxy/certificates/tls.crt" )
+      flags+=( "--proxy-client-key-file=/etc/virtualization-api-proxy/certificates/tls.key" )
       flags+=( "--service-account-name=virtualization-api" )
       flags+=( "--service-account-namespace={{ .BaseNamespace }}" )
 
-      ./hack/mirrord.sh run --app="$PWD/cmd/virtualization-api/main.go" \
+      TMPDIR=/tmp ./hack/mirrord.sh run --app="$PWD/cmd/virtualization-api/main.go" \
       --deployment="virtualization-api"                                 \
       --namespace="{{ .BaseNamespace }}"                                \
       --flags="\"${flags[@]}\""
diff --git a/images/virtualization-artifact/go.sum b/images/virtualization-artifact/go.sum
index 51c08a412f..ec2bb8a255 100644
--- a/images/virtualization-artifact/go.sum
+++ b/images/virtualization-artifact/go.sum
@@ -645,8 +645,6 @@ k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt
 k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-kubevirt.io/api v1.3.1 h1:MoTNo/zvDlZ44c2ocXLPln8XTaQOeUodiYbEKrTCqv4=
-kubevirt.io/api v1.3.1/go.mod h1:tCn7VAZktEvymk490iPSMPCmKM9UjbbfH2OsFR/IOLU=
 kubevirt.io/containerized-data-importer-api v1.60.3 h1:kQEXi7scpzUa0RPf3/3MKk1Kmem0ZlqqiuK3kDF5L2I=
 kubevirt.io/containerized-data-importer-api v1.60.3/go.mod h1:8mwrkZIdy8j/LmCyKt2wFXbiMavLUIqDaegaIF67CZs=
 kubevirt.io/controller-lifecycle-operator-sdk/api v0.0.0-20220329064328-f3cc58c6ed90 h1:QMrd0nKP0BGbnxTqakhDZAUhGKxPiPiN5gSDqKUmGGc=
diff --git a/images/virtualization-artifact/hack/mirrord.sh b/images/virtualization-artifact/hack/mirrord.sh
index 0b335fa979..1349afe0be 100755
--- a/images/virtualization-artifact/hack/mirrord.sh
+++ b/images/virtualization-artifact/hack/mirrord.sh
@@ -103,7 +103,7 @@ chmod +x "${BIN_DIR}/${BINARY}"
 if ! kubectl -n "${NAMESPACE}" get "deployment/${NEW_NAME}" &>/dev/null; then
   kubectl -n "${NAMESPACE}" get "deployment/${DEPLOYMENT}" -ojson | \
   jq --arg CONTAINER_NAME "$CONTAINER_NAME" --arg NEW_NAME "$NEW_NAME" '.metadata.name = $NEW_NAME |
-    (.spec.template.spec.containers[] | select(.name == $CONTAINER_NAME) ) |= (.command= [ "/bin/sh", "-c", "--" ] | .args = [ "while true; do sleep 60; done;" ] | .image = "alpine:3.20.1") |
+    (.spec.template.spec.containers[] | select(.name == $CONTAINER_NAME) ) |= (.command= [ "/bin/sh", "-c", "--" ] | .args = [ "while true; do sleep 60; done;" ] | .image = "alpine:3.20.1" | del(.livenessProbe) | del(.readinessProbe)) |
     .spec.replicas = 1 |
     .spec.template.metadata.labels.mirror = "true" |
     .spec.template.metadata.labels.ownerName = $NEW_NAME' | \
diff --git a/images/virtualization-artifact/pkg/apiserver/api/generated/openapi/zz_generated.openapi.go b/images/virtualization-artifact/pkg/apiserver/api/generated/openapi/zz_generated.openapi.go
index cbf532813d..2d9cbad7bb 100644
--- a/images/virtualization-artifact/pkg/apiserver/api/generated/openapi/zz_generated.openapi.go
+++ b/images/virtualization-artifact/pkg/apiserver/api/generated/openapi/zz_generated.openapi.go
@@ -4912,14 +4912,14 @@ func schema_virtualization_api_core_v1alpha2_VirtualMachineOperationCloneCustomi
 				Properties: map[string]spec.Schema{
 					"namePrefix": {
 						SchemaProps: spec.SchemaProps{
-							Description: "NamePrefix adds a prefix to resource names during cloning. Applied to VirtualDisk, VirtualMachineIPAddress, VirtualMachineMACAddress, and Secret resources.",
+							Description: "NamePrefix adds a prefix to resource names during cloning. Applied to VirtualMachine, VirtualDisk, VirtualMachineBlockDeviceAttachment, and Secret resources.",
 							Type:        []string{"string"},
 							Format:      "",
 						},
 					},
 					"nameSuffix": {
 						SchemaProps: spec.SchemaProps{
-							Description: "NameSuffix adds a suffix to resource names during cloning. Applied to VirtualDisk, VirtualMachineIPAddress, VirtualMachineMACAddress, and Secret resources.",
+							Description: "NameSuffix adds a suffix to resource names during cloning. Applied to VirtualMachine, VirtualDisk, VirtualMachineBlockDeviceAttachment, and Secret resources.",
 							Type:        []string{"string"},
 							Format:      "",
 						},
diff --git a/images/virtualization-artifact/pkg/common/annotations/annotations.go b/images/virtualization-artifact/pkg/common/annotations/annotations.go
index 43a15840f8..ba7453b2a8 100644
--- a/images/virtualization-artifact/pkg/common/annotations/annotations.go
+++ b/images/virtualization-artifact/pkg/common/annotations/annotations.go
@@ -160,6 +160,9 @@ const (
 	// AnnAccessMode is the annotation for indicating that access mode.  (USED IN STORAGE sds controllers)
 	AnnAccessModes           = AnnAPIGroupV + "/access-mode"
 	AnnAccessModesDeprecated = "accessModes"
+	// AnnStorageProvisioner is the annotation for indicating storage provisioner
+	AnnStorageProvisioner           = "volume.kubernetes.io/storage-provisioner"
+	AnnStorageProvisionerDeprecated = "volume.beta.kubernetes.io/storage-provisioner"
 
 	// AppLabel is the app name label.
 	AppLabel = "app"
diff --git a/images/virtualization-artifact/pkg/controller/conditions/builder.go b/images/virtualization-artifact/pkg/controller/conditions/builder.go
index 4ffbf9edaf..8fdefacd44 100644
--- a/images/virtualization-artifact/pkg/controller/conditions/builder.go
+++ b/images/virtualization-artifact/pkg/controller/conditions/builder.go
@@ -66,6 +66,8 @@ func SetCondition(c Conder, conditions *[]metav1.Condition) {
 		if !newCondition.LastTransitionTime.IsZero() &&
 			newCondition.LastTransitionTime.After(existingCondition.LastTransitionTime.Time) {
 			existingCondition.LastTransitionTime = newCondition.LastTransitionTime
+		} else {
+			existingCondition.LastTransitionTime = metav1.NewTime(time.Now())
 		}
 	}
 
diff --git a/images/virtualization-artifact/pkg/controller/kvapi/kvapi.go b/images/virtualization-artifact/pkg/controller/kvapi/kvapi.go
deleted file mode 100644
index ad900f5108..0000000000
--- a/images/virtualization-artifact/pkg/controller/kvapi/kvapi.go
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
-Copyright 2024 Flant JSC
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package kvapi
-
-import (
-	"context"
-	"fmt"
-
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
-	virtv1 "kubevirt.io/api/core/v1"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-
-	"github.com/deckhouse/virtualization-controller/pkg/common/patch"
-)
-
-type Kubevirt interface {
-	HotplugVolumesEnabled() bool
-}
-
-// Deprecated: use virt client.
-func New(cli client.Client, kv Kubevirt) *KvAPI {
-	return &KvAPI{
-		Client:   cli,
-		kubevirt: kv,
-	}
-}
-
-// Deprecated: use virt client.
-type KvAPI struct {
-	client.Client
-	kubevirt Kubevirt
-}
-
-// Deprecated: use virt client.
-func (api *KvAPI) AddVolume(ctx context.Context, kvvm *virtv1.VirtualMachine, opts *virtv1.AddVolumeOptions) error {
-	return api.addVolume(ctx, kvvm, opts)
-}
-
-// Deprecated: use virt client.
-func (api *KvAPI) RemoveVolume(ctx context.Context, kvvm *virtv1.VirtualMachine, opts *virtv1.RemoveVolumeOptions) error {
-	return api.removeVolume(ctx, kvvm, opts)
-}
-
-func (api *KvAPI) addVolume(ctx context.Context, kvvm *virtv1.VirtualMachine, opts *virtv1.AddVolumeOptions) error {
-	if kvvm == nil {
-		return nil
-	}
-	if !api.kubevirt.HotplugVolumesEnabled() {
-		return fmt.Errorf("unable to add volume because HotplugVolumes feature gate is not enabled")
-	}
-	// Validate AddVolumeOptions
-	switch {
-	case opts.Name == "":
-		return fmt.Errorf("AddVolumeOptions requires name to be set")
-	case opts.Disk == nil:
-		return fmt.Errorf("AddVolumeOptions requires disk to not be nil")
-	case opts.VolumeSource == nil:
-		return fmt.Errorf("AddVolumeOptions requires VolumeSource to not be nil")
-	}
-
-	opts.Disk.Name = opts.Name
-
-	volumeRequest := virtv1.VirtualMachineVolumeRequest{
-		AddVolumeOptions: opts,
-	}
-
-	switch {
-	case opts.VolumeSource.DataVolume != nil:
-		opts.VolumeSource.DataVolume.Hotpluggable = true
-	case opts.VolumeSource.PersistentVolumeClaim != nil:
-		opts.VolumeSource.PersistentVolumeClaim.Hotpluggable = true
-	}
-
-	return api.vmVolumePatchStatus(ctx, kvvm, &volumeRequest)
-}
-
-func (api *KvAPI) removeVolume(ctx context.Context, kvvm *virtv1.VirtualMachine, opts *virtv1.RemoveVolumeOptions) error {
-	if kvvm == nil {
-		return nil
-	}
-	if !api.kubevirt.HotplugVolumesEnabled() {
-		return fmt.Errorf("unable to remove volume because HotplugVolumes feature gate is not enabled")
-	}
-
-	if opts.Name == "" {
-		return fmt.Errorf("RemoveVolumeOptions requires name to be set")
-	}
-
-	volumeRequest := virtv1.VirtualMachineVolumeRequest{
-		RemoveVolumeOptions: opts,
-	}
-
-	return api.vmVolumePatchStatus(ctx, kvvm, &volumeRequest)
-}
-
-func (api *KvAPI) vmVolumePatchStatus(ctx context.Context, kvvm *virtv1.VirtualMachine, volumeRequest *virtv1.VirtualMachineVolumeRequest) error {
-	if kvvm == nil {
-		return nil
-	}
-	err := verifyVolumeOption(kvvm.Spec.Template.Spec.Volumes, volumeRequest)
-	if err != nil {
-		return err
-	}
-
-	jp, err := generateVMVolumeRequestPatch(kvvm, volumeRequest)
-	if err != nil {
-		return err
-	}
-
-	dryRunOption := api.getDryRunOption(volumeRequest)
-	err = api.Client.Status().Patch(ctx, kvvm,
-		client.RawPatch(types.JSONPatchType, []byte(jp)),
-		&client.SubResourcePatchOptions{
-			PatchOptions: client.PatchOptions{DryRun: dryRunOption},
-		})
-	if err != nil {
-		return fmt.Errorf("unable to patch kvvm: %w", err)
-	}
-
-	return nil
-}
-
-func (api *KvAPI) getDryRunOption(volumeRequest *virtv1.VirtualMachineVolumeRequest) []string {
-	var dryRunOption []string
-	if options := volumeRequest.AddVolumeOptions; options != nil && options.DryRun != nil && options.DryRun[0] == metav1.DryRunAll {
-		dryRunOption = volumeRequest.AddVolumeOptions.DryRun
-	} else if options := volumeRequest.RemoveVolumeOptions; options != nil && options.DryRun != nil && options.DryRun[0] == metav1.DryRunAll {
-		dryRunOption = volumeRequest.RemoveVolumeOptions.DryRun
-	}
-	return dryRunOption
-}
-
-func verifyVolumeOption(volumes []virtv1.Volume, volumeRequest *virtv1.VirtualMachineVolumeRequest) error {
-	foundRemoveVol := false
-	for _, volume := range volumes {
-		if volumeRequest.AddVolumeOptions != nil {
-			volSourceName := volumeSourceName(volumeRequest.AddVolumeOptions.VolumeSource)
-			if volumeNameExists(volume, volumeRequest.AddVolumeOptions.Name) {
-				return fmt.Errorf("unable to add volume [%s] because volume with that name already exists", volumeRequest.AddVolumeOptions.Name)
-			}
-			if volumeSourceExists(volume, volSourceName) {
-				return fmt.Errorf("unable to add volume source [%s] because it already exists", volSourceName)
-			}
-		} else if volumeRequest.RemoveVolumeOptions != nil && VolumeExists(volume, volumeRequest.RemoveVolumeOptions.Name) {
-			if !volumeHotpluggable(volume) {
-				return fmt.Errorf("unable to remove volume [%s] because it is not hotpluggable", volume.Name)
-			}
-			foundRemoveVol = true
-			break
-		}
-	}
-
-	if volumeRequest.RemoveVolumeOptions != nil && !foundRemoveVol {
-		return fmt.Errorf("unable to remove volume [%s] because it does not exist", volumeRequest.RemoveVolumeOptions.Name)
-	}
-
-	return nil
-}
-
-func volumeSourceName(volumeSource *virtv1.HotplugVolumeSource) string {
-	if volumeSource.DataVolume != nil {
-		return volumeSource.DataVolume.Name
-	}
-	if volumeSource.PersistentVolumeClaim != nil {
-		return volumeSource.PersistentVolumeClaim.ClaimName
-	}
-	return ""
-}
-
-func VolumeExists(volume virtv1.Volume, volumeName string) bool {
-	return volumeNameExists(volume, volumeName) || volumeSourceExists(volume, volumeName)
-}
-
-func volumeNameExists(volume virtv1.Volume, volumeName string) bool {
-	return volume.Name == volumeName
-}
-
-func volumeSourceExists(volume virtv1.Volume, volumeName string) bool {
-	// Do not add ContainerDisk!!!
-	return (volume.DataVolume != nil && volume.DataVolume.Name == volumeName) ||
-		(volume.PersistentVolumeClaim != nil && volume.PersistentVolumeClaim.ClaimName == volumeName)
-}
-
-func volumeHotpluggable(volume virtv1.Volume) bool {
-	return (volume.DataVolume != nil && volume.DataVolume.Hotpluggable) || (volume.PersistentVolumeClaim != nil && volume.PersistentVolumeClaim.Hotpluggable)
-}
-
-func generateVMVolumeRequestPatch(vm *virtv1.VirtualMachine, volumeRequest *virtv1.VirtualMachineVolumeRequest) (string, error) {
-	vmCopy := vm.DeepCopy()
-
-	// We only validate the list against other items in the list at this point.
-	// The VM validation webhook will validate the list against the VMI spec
-	// during the Patch command
-	if volumeRequest.AddVolumeOptions != nil {
-		if err := addAddVolumeRequests(vmCopy, volumeRequest); err != nil {
-			return "", err
-		}
-	} else if volumeRequest.RemoveVolumeOptions != nil {
-		if err := addRemoveVolumeRequests(vmCopy, volumeRequest); err != nil {
-			return "", err
-		}
-	}
-
-	verb := patch.PatchAddOp
-	if len(vm.Status.VolumeRequests) > 0 {
-		verb = patch.PatchReplaceOp
-	}
-	jop := patch.NewJSONPatchOperation(verb, "/status/volumeRequests", vmCopy.Status.VolumeRequests)
-	jp := patch.NewJSONPatch(jop)
-
-	return jp.String()
-}
-
-func addAddVolumeRequests(vm *virtv1.VirtualMachine, volumeRequest *virtv1.VirtualMachineVolumeRequest) error {
-	name := volumeRequest.AddVolumeOptions.Name
-	for _, request := range vm.Status.VolumeRequests {
-		if err := validateAddVolumeRequest(request, name); err != nil {
-			return err
-		}
-	}
-	vm.Status.VolumeRequests = append(vm.Status.VolumeRequests, *volumeRequest)
-	return nil
-}
-
-func validateAddVolumeRequest(request virtv1.VirtualMachineVolumeRequest, name string) error {
-	if addVolumeRequestExists(request, name) {
-		return fmt.Errorf("add volume request for volume [%s] already exists", name)
-	}
-	if removeVolumeRequestExists(request, name) {
-		return fmt.Errorf("unable to add volume since a remove volume request for volume [%s] already exists and is still being processed", name)
-	}
-	return nil
-}
-
-func addRemoveVolumeRequests(vm *virtv1.VirtualMachine, volumeRequest *virtv1.VirtualMachineVolumeRequest) error {
-	name := volumeRequest.RemoveVolumeOptions.Name
-	var volumeRequestsList []virtv1.VirtualMachineVolumeRequest
-	for _, request := range vm.Status.VolumeRequests {
-		if addVolumeRequestExists(request, name) {
-			// Filter matching AddVolume requests from the new list.
-			continue
-		}
-		if removeVolumeRequestExists(request, name) {
-			return fmt.Errorf("a remove volume request for volume [%s] already exists and is still being processed", name)
-		}
-		volumeRequestsList = append(volumeRequestsList, request)
-	}
-	volumeRequestsList = append(volumeRequestsList, *volumeRequest)
-	vm.Status.VolumeRequests = volumeRequestsList
-	return nil
-}
-
-func addVolumeRequestExists(request virtv1.VirtualMachineVolumeRequest, name string) bool {
-	return request.AddVolumeOptions != nil && request.AddVolumeOptions.Name == name
-}
-
-func removeVolumeRequestExists(request virtv1.VirtualMachineVolumeRequest, name string) bool {
-	return request.RemoveVolumeOptions != nil && request.RemoveVolumeOptions.Name == name
-}
diff --git a/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm.go b/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm.go
index 16f3951502..07c3df0628 100644
--- a/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm.go
+++ b/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm.go
@@ -373,7 +373,8 @@ func (b *KVVM) SetDisk(name string, opts SetDiskOptions) error {
 
 	case opts.ContainerDisk != nil:
 		vs.ContainerDisk = &virtv1.ContainerDiskSource{
-			Image: *opts.ContainerDisk,
+			Image:        *opts.ContainerDisk,
+			Hotpluggable: opts.IsHotplugged,
 		}
 
 	case opts.Provisioning != nil:
diff --git a/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm_utils.go b/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm_utils.go
index f62a4225e1..4b703cc0a8 100644
--- a/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm_utils.go
+++ b/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm_utils.go
@@ -133,7 +133,7 @@ func ApplyVirtualMachineSpec(
 			})
 		}
 
-		if volume.ContainerDisk != nil && isHotplugged(volume, vm, vmbdas) {
+		if volume.ContainerDisk != nil && volume.ContainerDisk.Hotpluggable {
 			hotpluggedDevices = append(hotpluggedDevices, HotPlugDeviceSettings{
 				VolumeName: volume.Name,
 				Image:      volume.ContainerDisk.Image,
@@ -321,15 +321,3 @@ func setNetworksAnnotation(kvvm *KVVM, networkSpec network.InterfaceSpecList) er
 	kvvm.SetKVVMIAnnotation(annotations.AnnNetworksSpec, networkConfigStr)
 	return nil
 }
-
-func isHotplugged(volume virtv1.Volume, vm *v1alpha2.VirtualMachine, vmbdas map[v1alpha2.VMBDAObjectRef][]*v1alpha2.VirtualMachineBlockDeviceAttachment) bool {
-	name, kind := GetOriginalDiskName(volume.Name)
-	for _, bdRef := range vm.Spec.BlockDeviceRefs {
-		if bdRef.Name == name && bdRef.Kind == kind {
-			return false
-		}
-	}
-
-	_, ok := vmbdas[v1alpha2.VMBDAObjectRef{Name: name, Kind: v1alpha2.VMBDAObjectRefKind(kind)}]
-	return ok
-}
diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/source/step/create_pvc_from_vdsnapshot_step.go b/images/virtualization-artifact/pkg/controller/vd/internal/source/step/create_pvc_from_vdsnapshot_step.go
index 4aa5d43567..955c9fd662 100644
--- a/images/virtualization-artifact/pkg/controller/vd/internal/source/step/create_pvc_from_vdsnapshot_step.go
+++ b/images/virtualization-artifact/pkg/controller/vd/internal/source/step/create_pvc_from_vdsnapshot_step.go
@@ -24,6 +24,7 @@ import (
 
 	vsv1 "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
 	corev1 "k8s.io/api/core/v1"
+	storagev1 "k8s.io/api/storage/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -38,6 +39,7 @@ import (
 	"github.com/deckhouse/virtualization-controller/pkg/controller/service"
 	vdsupplements "github.com/deckhouse/virtualization-controller/pkg/controller/vd/internal/supplements"
 	"github.com/deckhouse/virtualization-controller/pkg/eventrecord"
+	"github.com/deckhouse/virtualization-controller/pkg/logger"
 	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 	"github.com/deckhouse/virtualization/api/core/v1alpha2/vdcondition"
 )
@@ -103,6 +105,21 @@ func (s CreatePVCFromVDSnapshotStep) Take(ctx context.Context, vd *v1alpha2.Virt
 		return &reconcile.Result{}, nil
 	}
 
+	if err := s.validateStorageClassCompatibility(ctx, vd, vdSnapshot, vs); err != nil {
+		vd.Status.Phase = v1alpha2.DiskFailed
+		s.cb.
+			Status(metav1.ConditionFalse).
+			Reason(vdcondition.ProvisioningFailed).
+			Message(err.Error())
+		s.recorder.Event(
+			vd,
+			corev1.EventTypeWarning,
+			v1alpha2.ReasonDataSourceSyncFailed,
+			err.Error(),
+		)
+		return &reconcile.Result{}, nil
+	}
+
 	pvc := s.buildPVC(vd, vs)
 
 	err = s.client.Create(ctx, pvc)
@@ -158,10 +175,16 @@ func (s CreatePVCFromVDSnapshotStep) AddOriginalMetadata(vd *v1alpha2.VirtualDis
 }
 
 func (s CreatePVCFromVDSnapshotStep) buildPVC(vd *v1alpha2.VirtualDisk, vs *vsv1.VolumeSnapshot) *corev1.PersistentVolumeClaim {
-	storageClassName := vs.Annotations[annotations.AnnStorageClassName]
-	if storageClassName == "" {
-		storageClassName = vs.Annotations[annotations.AnnStorageClassNameDeprecated]
+	var storageClassName string
+	if vd.Spec.PersistentVolumeClaim.StorageClass != nil && *vd.Spec.PersistentVolumeClaim.StorageClass != "" {
+		storageClassName = *vd.Spec.PersistentVolumeClaim.StorageClass
+	} else {
+		storageClassName = vs.Annotations[annotations.AnnStorageClassName]
+		if storageClassName == "" {
+			storageClassName = vs.Annotations[annotations.AnnStorageClassNameDeprecated]
+		}
 	}
+
 	volumeMode := vs.Annotations[annotations.AnnVolumeMode]
 	if volumeMode == "" {
 		volumeMode = vs.Annotations[annotations.AnnVolumeModeDeprecated]
@@ -219,3 +242,52 @@ func (s CreatePVCFromVDSnapshotStep) buildPVC(vd *v1alpha2.VirtualDisk, vs *vsv1
 		Spec: spec,
 	}
 }
+
+func (s CreatePVCFromVDSnapshotStep) validateStorageClassCompatibility(ctx context.Context, vd *v1alpha2.VirtualDisk, vdSnapshot *v1alpha2.VirtualDiskSnapshot, vs *vsv1.VolumeSnapshot) error {
+	if vd.Spec.PersistentVolumeClaim.StorageClass == nil || *vd.Spec.PersistentVolumeClaim.StorageClass == "" {
+		return nil
+	}
+
+	targetSCName := *vd.Spec.PersistentVolumeClaim.StorageClass
+
+	var targetSC storagev1.StorageClass
+	err := s.client.Get(ctx, types.NamespacedName{Name: targetSCName}, &targetSC)
+	if err != nil {
+		return fmt.Errorf("cannot fetch target storage class %q: %w", targetSCName, err)
+	}
+
+	log, _ := logger.GetDataSourceContext(ctx, "objectref")
+	if vs.Spec.Source.PersistentVolumeClaimName == nil || *vs.Spec.Source.PersistentVolumeClaimName == "" {
+		log.With("volumeSnapshot.name", vs.Name).Debug("Cannot determine original PVC from VolumeSnapshot, skipping storage class compatibility validation")
+		return nil
+	}
+
+	pvcName := *vs.Spec.Source.PersistentVolumeClaimName
+
+	var originalPVC corev1.PersistentVolumeClaim
+	err = s.client.Get(ctx, types.NamespacedName{Name: pvcName, Namespace: vdSnapshot.Namespace}, &originalPVC)
+	if err != nil {
+		return fmt.Errorf("cannot fetch original PVC %q: %w", pvcName, err)
+	}
+
+	originalProvisioner := originalPVC.Annotations[annotations.AnnStorageProvisioner]
+	if originalProvisioner == "" {
+		originalProvisioner = originalPVC.Annotations[annotations.AnnStorageProvisionerDeprecated]
+	}
+
+	if originalProvisioner == "" {
+		log.With("pvc.name", pvcName).Debug("Cannot determine original provisioner from PVC annotations, skipping storage class compatibility validation")
+		return nil
+	}
+
+	if targetSC.Provisioner != originalProvisioner {
+		return fmt.Errorf(
+			"cannot restore snapshot to storage class %q: incompatible storage providers. "+
+				"Original snapshot was created by %q, target storage class uses %q. "+
+				"Cross-provider snapshot restore is not supported",
+			targetSCName, originalProvisioner, targetSC.Provisioner,
+		)
+	}
+
+	return nil
+}
diff --git a/images/virtualization-artifact/pkg/controller/vi/internal/source/step/create_pvc_step.go b/images/virtualization-artifact/pkg/controller/vi/internal/source/step/create_pvc_step.go
index 972884d579..02d4008806 100644
--- a/images/virtualization-artifact/pkg/controller/vi/internal/source/step/create_pvc_step.go
+++ b/images/virtualization-artifact/pkg/controller/vi/internal/source/step/create_pvc_step.go
@@ -23,6 +23,7 @@ import (
 
 	vsv1 "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
 	corev1 "k8s.io/api/core/v1"
+	storagev1 "k8s.io/api/storage/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -103,6 +104,21 @@ func (s CreatePersistentVolumeClaimStep) Take(ctx context.Context, vi *v1alpha2.
 		return &reconcile.Result{}, nil
 	}
 
+	if err := s.validateStorageClassCompatibility(ctx, vi, vdSnapshot, vs); err != nil {
+		vi.Status.Phase = v1alpha2.ImageFailed
+		s.cb.
+			Status(metav1.ConditionFalse).
+			Reason(vicondition.ProvisioningFailed).
+			Message(err.Error())
+		s.recorder.Event(
+			vi,
+			corev1.EventTypeWarning,
+			v1alpha2.ReasonDataSourceSyncFailed,
+			err.Error(),
+		)
+		return &reconcile.Result{}, nil
+	}
+
 	pvc := s.buildPVC(vi, vs)
 
 	err = s.client.Create(ctx, pvc)
@@ -124,9 +140,14 @@ func (s CreatePersistentVolumeClaimStep) Take(ctx context.Context, vi *v1alpha2.
 }
 
 func (s CreatePersistentVolumeClaimStep) buildPVC(vi *v1alpha2.VirtualImage, vs *vsv1.VolumeSnapshot) *corev1.PersistentVolumeClaim {
-	storageClassName := vs.Annotations[annotations.AnnStorageClassName]
-	if storageClassName == "" {
-		storageClassName = vs.Annotations[annotations.AnnStorageClassNameDeprecated]
+	var storageClassName string
+	if vi.Spec.PersistentVolumeClaim.StorageClass != nil && *vi.Spec.PersistentVolumeClaim.StorageClass != "" {
+		storageClassName = *vi.Spec.PersistentVolumeClaim.StorageClass
+	} else {
+		storageClassName = vs.Annotations[annotations.AnnStorageClassName]
+		if storageClassName == "" {
+			storageClassName = vs.Annotations[annotations.AnnStorageClassNameDeprecated]
+		}
 	}
 	volumeMode := vs.Annotations[annotations.AnnVolumeMode]
 	if volumeMode == "" {
@@ -185,3 +206,52 @@ func (s CreatePersistentVolumeClaimStep) buildPVC(vi *v1alpha2.VirtualImage, vs
 		Spec: spec,
 	}
 }
+
+func (s CreatePersistentVolumeClaimStep) validateStorageClassCompatibility(ctx context.Context, vi *v1alpha2.VirtualImage, vdSnapshot *v1alpha2.VirtualDiskSnapshot, vs *vsv1.VolumeSnapshot) error {
+	if vi.Spec.PersistentVolumeClaim.StorageClass == nil || *vi.Spec.PersistentVolumeClaim.StorageClass == "" {
+		return nil
+	}
+
+	targetSCName := *vi.Spec.PersistentVolumeClaim.StorageClass
+
+	var targetSC storagev1.StorageClass
+	err := s.client.Get(ctx, types.NamespacedName{Name: targetSCName}, &targetSC)
+	if err != nil {
+		return fmt.Errorf("cannot fetch target storage class %q: %w", targetSCName, err)
+	}
+
+	log, _ := logger.GetDataSourceContext(ctx, "objectref")
+	if vs.Spec.Source.PersistentVolumeClaimName == nil || *vs.Spec.Source.PersistentVolumeClaimName == "" {
+		log.With("volumeSnapshot.name", vs.Name).Debug("Cannot determine original PVC from VolumeSnapshot, skipping storage class compatibility validation")
+		return nil
+	}
+
+	pvcName := *vs.Spec.Source.PersistentVolumeClaimName
+
+	var originalPVC corev1.PersistentVolumeClaim
+	err = s.client.Get(ctx, types.NamespacedName{Name: pvcName, Namespace: vdSnapshot.Namespace}, &originalPVC)
+	if err != nil {
+		return fmt.Errorf("cannot fetch original PVC %q: %w", pvcName, err)
+	}
+
+	originalProvisioner := originalPVC.Annotations[annotations.AnnStorageProvisioner]
+	if originalProvisioner == "" {
+		originalProvisioner = originalPVC.Annotations[annotations.AnnStorageProvisionerDeprecated]
+	}
+
+	if originalProvisioner == "" {
+		log.With("pvc.name", pvcName).Debug("Cannot determine original provisioner from PVC annotations, skipping storage class compatibility validation")
+		return nil
+	}
+
+	if targetSC.Provisioner != originalProvisioner {
+		return fmt.Errorf(
+			"cannot restore snapshot to storage class %q: incompatible storage providers. "+
+				"Original snapshot was created by %q, target storage class uses %q. "+
+				"Cross-provider snapshot restore is not supported",
+			targetSCName, originalProvisioner, targetSC.Provisioner,
+		)
+	}
+
+	return nil
+}
diff --git a/images/virtualization-artifact/pkg/controller/vm/internal/block_device_status.go b/images/virtualization-artifact/pkg/controller/vm/internal/block_device_status.go
index 07702e6600..b92db5c0ff 100644
--- a/images/virtualization-artifact/pkg/controller/vm/internal/block_device_status.go
+++ b/images/virtualization-artifact/pkg/controller/vm/internal/block_device_status.go
@@ -92,10 +92,8 @@ func (h *BlockDeviceHandler) getBlockDeviceStatusRefs(ctx context.Context, s sta
 		if err != nil {
 			return nil, err
 		}
-		ref.Hotplugged, err = h.isHotplugged(ctx, volume, kvvmiVolumeStatusByName, s)
-		if err != nil {
-			return nil, err
-		}
+
+		ref.Hotplugged = h.isHotplugged(volume, kvvmiVolumeStatusByName)
 		if ref.Hotplugged {
 			ref.VirtualMachineBlockDeviceAttachmentName, err = h.getBlockDeviceAttachmentName(ctx, kind, bdName, s)
 			if err != nil {
@@ -189,33 +187,23 @@ func (h *BlockDeviceHandler) getBlockDeviceTarget(volume virtv1.Volume, kvvmiVol
 	return vs.Target, ok
 }
 
-func (h *BlockDeviceHandler) isHotplugged(ctx context.Context, volume virtv1.Volume, kvvmiVolumeStatusByName map[string]virtv1.VolumeStatus, s state.VirtualMachineState) (bool, error) {
+func (h *BlockDeviceHandler) isHotplugged(volume virtv1.Volume, kvvmiVolumeStatusByName map[string]virtv1.VolumeStatus) bool {
 	switch {
 	// 1. If kvvmi has volume status with hotplugVolume reference then it's 100% hot-plugged volume.
 	case kvvmiVolumeStatusByName[volume.Name].HotplugVolume != nil:
-		return true, nil
+		return true
 
 	// 2. If kvvm has volume with hot-pluggable pvc reference then it's 100% hot-plugged volume.
 	case volume.PersistentVolumeClaim != nil && volume.PersistentVolumeClaim.Hotpluggable:
-		return true, nil
+		return true
 
-	// 3. We cannot check volume.ContainerDisk.Hotpluggable, as this field was added in our patches and is not reflected in the api version of virtv1 used by us.
-	// Until we have a 3rd-party repository to import the modified virtv1, we have to make decisions based on indirect signs.
-	// If there was a previously hot-plugged block device and the VMBDA is still alive, then it's a hot-plugged block device.
-	// TODO: Use volume.ContainerDisk.Hotpluggable for decision-making when the 3rd-party repository is available.
-	case volume.ContainerDisk != nil:
-		bdName, kind := kvbuilder.GetOriginalDiskName(volume.Name)
-		if h.canBeHotPlugged(s.VirtualMachine().Current(), kind, bdName) {
-			vmbdaName, err := h.getBlockDeviceAttachmentName(ctx, kind, bdName, s)
-			if err != nil {
-				return false, err
-			}
-			return vmbdaName != "", nil
-		}
+	// 3. If kvvm has volume with hot-pluggable disk reference then it's 100% hot-plugged volume.
+	case volume.ContainerDisk != nil && volume.ContainerDisk.Hotpluggable:
+		return true
 	}
 
 	// 4. Is not hot-plugged.
-	return false, nil
+	return false
 }
 
 func (h *BlockDeviceHandler) getBlockDeviceAttachmentName(ctx context.Context, kind v1alpha2.BlockDeviceKind, bdName string, s state.VirtualMachineState) (string, error) {
@@ -243,19 +231,3 @@ func (h *BlockDeviceHandler) getBlockDeviceAttachmentName(ctx context.Context, k
 
 	return vmbdas[0].Name, nil
 }
-
-func (h *BlockDeviceHandler) canBeHotPlugged(vm *v1alpha2.VirtualMachine, kind v1alpha2.BlockDeviceKind, bdName string) bool {
-	for _, bdRef := range vm.Status.BlockDeviceRefs {
-		if bdRef.Kind == kind && bdRef.Name == bdName {
-			return bdRef.Hotplugged
-		}
-	}
-
-	for _, bdRef := range vm.Spec.BlockDeviceRefs {
-		if bdRef.Kind == kind && bdRef.Name == bdName {
-			return false
-		}
-	}
-
-	return true
-}
diff --git a/images/virtualization-artifact/pkg/controller/vm/internal/network.go b/images/virtualization-artifact/pkg/controller/vm/internal/network.go
index 631bb6cddc..e50ff5b0b0 100644
--- a/images/virtualization-artifact/pkg/controller/vm/internal/network.go
+++ b/images/virtualization-artifact/pkg/controller/vm/internal/network.go
@@ -65,7 +65,11 @@ func (h *NetworkInterfaceHandler) Handle(ctx context.Context, s state.VirtualMac
 		Generation(vm.GetGeneration())
 
 	defer func() {
-		conditions.SetCondition(cb, &vm.Status.Conditions)
+		if cb.Condition().Status == metav1.ConditionUnknown {
+			conditions.RemoveCondition(vmcondition.TypeNetworkReady, &vm.Status.Conditions)
+		} else {
+			conditions.SetCondition(cb, &vm.Status.Conditions)
+		}
 	}()
 
 	if len(vm.Spec.Networks) > 1 {
diff --git a/images/virtualization-artifact/pkg/controller/vm/internal/network_test.go b/images/virtualization-artifact/pkg/controller/vm/internal/network_test.go
index 7710c17657..0ce49c45f7 100644
--- a/images/virtualization-artifact/pkg/controller/vm/internal/network_test.go
+++ b/images/virtualization-artifact/pkg/controller/vm/internal/network_test.go
@@ -134,16 +134,14 @@ var _ = Describe("NetworkInterfaceHandler", func() {
 				err := fakeClient.Get(ctx, client.ObjectKeyFromObject(vm), newVM)
 				Expect(err).NotTo(HaveOccurred())
 
-				cond, exists := conditions.GetCondition(vmcondition.TypeNetworkReady, newVM.Status.Conditions)
-				Expect(exists).To(BeTrue())
-				Expect(cond.Status).To(Equal(metav1.ConditionUnknown))
-				Expect(cond.Reason).To(Equal(conditions.ReasonUnknown.String()))
+				_, exists := conditions.GetCondition(vmcondition.TypeNetworkReady, newVM.Status.Conditions)
+				Expect(exists).To(BeFalse())
 				Expect(newVM.Status.Networks).NotTo(BeNil())
 			})
 		})
 
 		Describe("NetworkSpec have only 'Main' interface", func() {
-			It("Network status is not exist; Condition should have status 'False'", func() {
+			It("Condition should have status 'Unknown'", func() {
 				networkSpec := []v1alpha2.NetworksSpec{
 					{
 						Type: v1alpha2.NetworksTypeMain,
@@ -157,10 +155,8 @@ var _ = Describe("NetworkInterfaceHandler", func() {
 				err := fakeClient.Get(ctx, client.ObjectKeyFromObject(vm), newVM)
 				Expect(err).NotTo(HaveOccurred())
 
-				cond, exists := conditions.GetCondition(vmcondition.TypeNetworkReady, newVM.Status.Conditions)
-				Expect(exists).To(BeTrue())
-				Expect(cond.Status).To(Equal(metav1.ConditionUnknown))
-				Expect(cond.Reason).To(Equal(conditions.ReasonUnknown.String()))
+				_, exists := conditions.GetCondition(vmcondition.TypeNetworkReady, newVM.Status.Conditions)
+				Expect(exists).To(BeFalse())
 				Expect(newVM.Status.Networks).NotTo(BeNil())
 			})
 		})
diff --git a/images/virtualization-artifact/pkg/controller/vm/internal/validators/networks_validator.go b/images/virtualization-artifact/pkg/controller/vm/internal/validators/networks_validator.go
index 834368708a..bf441ecda2 100644
--- a/images/virtualization-artifact/pkg/controller/vm/internal/validators/networks_validator.go
+++ b/images/virtualization-artifact/pkg/controller/vm/internal/validators/networks_validator.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"fmt"
 
+	"k8s.io/apimachinery/pkg/api/equality"
 	"k8s.io/component-base/featuregate"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
@@ -38,17 +39,21 @@ func NewNetworksValidator(featureGate featuregate.FeatureGate) *NetworksValidato
 }
 
 func (v *NetworksValidator) ValidateCreate(_ context.Context, vm *v1alpha2.VirtualMachine) (admission.Warnings, error) {
-	return v.Validate(vm)
-}
+	networksSpec := vm.Spec.Networks
+	if len(networksSpec) == 0 {
+		return nil, nil
+	}
 
-func (v *NetworksValidator) ValidateUpdate(_ context.Context, _, newVM *v1alpha2.VirtualMachine) (admission.Warnings, error) {
-	return v.Validate(newVM)
-}
+	if !v.featureGate.Enabled(featuregates.SDN) {
+		return nil, fmt.Errorf("network configuration requires SDN to be enabled")
+	}
 
-func (v *NetworksValidator) Validate(vm *v1alpha2.VirtualMachine) (admission.Warnings, error) {
-	networksSpec := vm.Spec.Networks
+	return v.validateNetworksSpec(networksSpec)
+}
 
-	if len(networksSpec) == 0 {
+func (v *NetworksValidator) ValidateUpdate(_ context.Context, oldVM, newVM *v1alpha2.VirtualMachine) (admission.Warnings, error) {
+	newNetworksSpec := newVM.Spec.Networks
+	if len(newNetworksSpec) == 0 {
 		return nil, nil
 	}
 
@@ -56,6 +61,14 @@ func (v *NetworksValidator) Validate(vm *v1alpha2.VirtualMachine) (admission.War
 		return nil, fmt.Errorf("network configuration requires SDN to be enabled")
 	}
 
+	isChanged := !equality.Semantic.DeepEqual(newNetworksSpec, oldVM.Spec.Networks)
+	if isChanged {
+		return v.validateNetworksSpec(newNetworksSpec)
+	}
+	return nil, nil
+}
+
+func (v *NetworksValidator) validateNetworksSpec(networksSpec []v1alpha2.NetworksSpec) (admission.Warnings, error) {
 	if networksSpec[0].Type != v1alpha2.NetworksTypeMain {
 		return nil, fmt.Errorf("first network in the list must be of type '%s'", v1alpha2.NetworksTypeMain)
 	}
@@ -63,6 +76,8 @@ func (v *NetworksValidator) Validate(vm *v1alpha2.VirtualMachine) (admission.War
 		return nil, fmt.Errorf("network with type '%s' should not have a name", v1alpha2.NetworksTypeMain)
 	}
 
+	namesSet := make(map[string]struct{})
+
 	for i, network := range networksSpec {
 		if network.Type == v1alpha2.NetworksTypeMain {
 			if i > 0 {
@@ -70,10 +85,14 @@ func (v *NetworksValidator) Validate(vm *v1alpha2.VirtualMachine) (admission.War
 			}
 			continue
 		}
-
 		if network.Name == "" {
 			return nil, fmt.Errorf("network at index %d with type '%s' must have a non-empty name", i, network.Type)
 		}
+
+		if _, exists := namesSet[network.Name]; exists {
+			return nil, fmt.Errorf("network name '%s' is duplicated", network.Name)
+		}
+		namesSet[network.Name] = struct{}{}
 	}
 
 	return nil, nil
diff --git a/images/virtualization-artifact/pkg/controller/vm/internal/validators/networks_validator_test.go b/images/virtualization-artifact/pkg/controller/vm/internal/validators/networks_validator_test.go
index 0d66a9a803..9a35d4a80d 100644
--- a/images/virtualization-artifact/pkg/controller/vm/internal/validators/networks_validator_test.go
+++ b/images/virtualization-artifact/pkg/controller/vm/internal/validators/networks_validator_test.go
@@ -24,7 +24,7 @@ import (
 	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
 
-func TestNetworksValidate(t *testing.T) {
+func TestNetworksValidateCreate(t *testing.T) {
 	tests := []struct {
 		networks   []v1alpha2.NetworksSpec
 		sdnEnabled bool
@@ -36,12 +36,13 @@ func TestNetworksValidate(t *testing.T) {
 		{[]v1alpha2.NetworksSpec{{Type: v1alpha2.NetworksTypeMain, Name: "main"}}, true, false},
 		{[]v1alpha2.NetworksSpec{{Type: v1alpha2.NetworksTypeNetwork, Name: "test"}, {Type: v1alpha2.NetworksTypeMain}}, true, false},
 		{[]v1alpha2.NetworksSpec{{Type: v1alpha2.NetworksTypeMain}, {Type: v1alpha2.NetworksTypeNetwork, Name: "test"}}, true, true},
+		{[]v1alpha2.NetworksSpec{{Type: v1alpha2.NetworksTypeMain}, {Type: v1alpha2.NetworksTypeNetwork, Name: "test"}, {Type: v1alpha2.NetworksTypeNetwork, Name: "test"}}, true, false},
 		{[]v1alpha2.NetworksSpec{{Type: v1alpha2.NetworksTypeMain}, {Type: v1alpha2.NetworksTypeNetwork}}, true, false},
 		{[]v1alpha2.NetworksSpec{{Type: v1alpha2.NetworksTypeMain}}, false, false},
 	}
 
 	for i, test := range tests {
-		t.Run(fmt.Sprintf("TestCase%d", i), func(t *testing.T) {
+		t.Run(fmt.Sprintf("CreateTestCase%d", i), func(t *testing.T) {
 			vm := &v1alpha2.VirtualMachine{Spec: v1alpha2.VirtualMachineSpec{Networks: test.networks}}
 
 			// Create feature gate with SDN
@@ -51,13 +52,120 @@ func TestNetworksValidate(t *testing.T) {
 			}
 			networkValidator := NewNetworksValidator(featureGate)
 
-			_, err := networkValidator.Validate(vm)
+			_, err := networkValidator.ValidateCreate(t.Context(), vm)
 			if test.valid && err != nil {
-				t.Errorf("For spec %s expected valid, but validation failed", test.networks)
+				t.Errorf("Validation failed for spec %s: expected valid, but got an error: %v", test.networks, err)
 			}
+			if !test.valid && err == nil {
+				t.Errorf("Validation succeeded for spec %s: expected error, but got none", test.networks)
+			}
+		})
+	}
+}
 
+func TestNetworksValidateUpdate(t *testing.T) {
+	tests := []struct {
+		oldNetworksSpec []v1alpha2.NetworksSpec
+		newNetworksSpec []v1alpha2.NetworksSpec
+		sdnEnabled      bool
+		valid           bool
+	}{
+		{
+			oldNetworksSpec: []v1alpha2.NetworksSpec{},
+			newNetworksSpec: []v1alpha2.NetworksSpec{},
+			sdnEnabled:      true,
+			valid:           true,
+		},
+		{
+			oldNetworksSpec: []v1alpha2.NetworksSpec{},
+			newNetworksSpec: []v1alpha2.NetworksSpec{{Type: v1alpha2.NetworksTypeMain}},
+			sdnEnabled:      true,
+			valid:           true,
+		},
+		{
+			oldNetworksSpec: []v1alpha2.NetworksSpec{},
+			newNetworksSpec: []v1alpha2.NetworksSpec{
+				{Type: v1alpha2.NetworksTypeMain},
+				{Type: v1alpha2.NetworksTypeNetwork, Name: "test"},
+			},
+			sdnEnabled: true,
+			valid:      true,
+		},
+		{
+			oldNetworksSpec: []v1alpha2.NetworksSpec{},
+			newNetworksSpec: []v1alpha2.NetworksSpec{
+				{Type: v1alpha2.NetworksTypeMain},
+				{Type: v1alpha2.NetworksTypeNetwork, Name: "test"},
+				{Type: v1alpha2.NetworksTypeNetwork, Name: "test"},
+			},
+			sdnEnabled: true,
+			valid:      false,
+		},
+		{
+			oldNetworksSpec: []v1alpha2.NetworksSpec{
+				{Type: v1alpha2.NetworksTypeMain},
+				{Type: v1alpha2.NetworksTypeNetwork, Name: "test"},
+				{Type: v1alpha2.NetworksTypeNetwork, Name: "test"},
+				{Type: v1alpha2.NetworksTypeNetwork, Name: "test"},
+			},
+			newNetworksSpec: []v1alpha2.NetworksSpec{
+				{Type: v1alpha2.NetworksTypeMain},
+				{Type: v1alpha2.NetworksTypeNetwork, Name: "test"},
+				{Type: v1alpha2.NetworksTypeNetwork, Name: "test"},
+			},
+			sdnEnabled: true,
+			valid:      false,
+		},
+		{
+			oldNetworksSpec: []v1alpha2.NetworksSpec{
+				{Type: v1alpha2.NetworksTypeMain},
+				{Type: v1alpha2.NetworksTypeNetwork, Name: "test"},
+				{Type: v1alpha2.NetworksTypeNetwork, Name: "test"},
+				{Type: v1alpha2.NetworksTypeNetwork, Name: "test"},
+			},
+			newNetworksSpec: []v1alpha2.NetworksSpec{
+				{Type: v1alpha2.NetworksTypeMain},
+				{Type: v1alpha2.NetworksTypeNetwork, Name: "test"},
+			},
+			sdnEnabled: true,
+			valid:      true,
+		},
+	}
+
+	for i, test := range tests {
+		t.Run(fmt.Sprintf("UpdateTestCase%d", i), func(t *testing.T) {
+			oldVM := &v1alpha2.VirtualMachine{
+				Spec: v1alpha2.VirtualMachineSpec{
+					Networks: test.oldNetworksSpec,
+				},
+			}
+			newVM := &v1alpha2.VirtualMachine{
+				Spec: v1alpha2.VirtualMachineSpec{
+					Networks: test.newNetworksSpec,
+				},
+			}
+
+			// Create feature gate with SDN
+			featureGate, _, setFromMap, _ := featuregates.New()
+			if test.sdnEnabled {
+				_ = setFromMap(map[string]bool{
+					string(featuregates.SDN): true,
+				})
+			}
+			networkValidator := NewNetworksValidator(featureGate)
+			_, err := networkValidator.ValidateUpdate(t.Context(), oldVM, newVM)
+
+			if test.valid && err != nil {
+				t.Errorf(
+					"Validation failed for old spec %v and new spec %v: expected valid, but got an error: %v",
+					test.oldNetworksSpec, test.newNetworksSpec, err,
+				)
+			}
 			if !test.valid && err == nil {
-				t.Errorf("For spec %s expected not valid, but validation succeeded", test.networks)
+				t.Errorf(
+					"Validation succeeded for old spec %v and new spec %v: expected error, but got none",
+					test.oldNetworksSpec, test.newNetworksSpec,
+				)
 			}
 		})
 	}
diff --git a/images/virtualization-artifact/pkg/controller/vmip/internal/step/take_lease_step.go b/images/virtualization-artifact/pkg/controller/vmip/internal/step/take_lease_step.go
index 65ae25c9a5..437d9d9782 100644
--- a/images/virtualization-artifact/pkg/controller/vmip/internal/step/take_lease_step.go
+++ b/images/virtualization-artifact/pkg/controller/vmip/internal/step/take_lease_step.go
@@ -78,7 +78,7 @@ func (s TakeLeaseStep) Take(ctx context.Context, vmip *v1alpha2.VirtualMachineIP
 		s.cb.
 			Status(metav1.ConditionFalse).
 			Reason(vmipcondition.VirtualMachineIPAddressLeaseNotReady).
-			Message(fmt.Sprintf("The VirtualMachineIPAddressLease %q alrady has a reference to another VirtualMachineIPAddress.", s.lease.Name))
+			Message(fmt.Sprintf("The VirtualMachineIPAddressLease %q already has a reference to another VirtualMachineIPAddress.", s.lease.Name))
 		return &reconcile.Result{}, nil
 	}
 
diff --git a/images/virtualization-artifact/pkg/controller/vmip/vmip_webhook.go b/images/virtualization-artifact/pkg/controller/vmip/vmip_webhook.go
index 49f99b77ec..89a78edb66 100644
--- a/images/virtualization-artifact/pkg/controller/vmip/vmip_webhook.go
+++ b/images/virtualization-artifact/pkg/controller/vmip/vmip_webhook.go
@@ -82,7 +82,7 @@ func (v *Validator) ValidateCreate(ctx context.Context, obj runtime.Object) (adm
 	return warnings, nil
 }
 
-func (v *Validator) ValidateUpdate(_ context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
+func (v *Validator) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
 	oldVmip, ok := oldObj.(*v1alpha2.VirtualMachineIPAddress)
 	if !ok {
 		return nil, fmt.Errorf("expected an old VirtualMachineIP but got a %T", oldObj)
@@ -103,6 +103,20 @@ func (v *Validator) ValidateUpdate(_ context.Context, oldObj, newObj runtime.Obj
 		return nil, fmt.Errorf("error validating VirtualMachineIP update: %w", err)
 	}
 
+	var warnings admission.Warnings
+
+	if newVmip.Spec.StaticIP != "" && oldVmip.Spec.StaticIP != newVmip.Spec.StaticIP {
+		err = v.validateAllocatedIPAddresses(ctx, newVmip.Spec.StaticIP)
+		switch {
+		case err == nil:
+			// OK.
+		case errors.Is(err, service.ErrIPAddressOutOfRange):
+			warnings = append(warnings, fmt.Sprintf("The requested address %s is out of the valid range", newVmip.Spec.StaticIP))
+		default:
+			return nil, err
+		}
+	}
+
 	boundCondition, _ := conditions.GetCondition(vmipcondition.BoundType, oldVmip.Status.Conditions)
 	if boundCondition.Status == metav1.ConditionTrue {
 		if oldVmip.Spec.Type == v1alpha2.VirtualMachineIPAddressTypeAuto && newVmip.Spec.Type == v1alpha2.VirtualMachineIPAddressTypeStatic {
@@ -123,7 +137,7 @@ func (v *Validator) ValidateUpdate(_ context.Context, oldObj, newObj runtime.Obj
 		}
 	}
 
-	return nil, nil
+	return warnings, nil
 }
 
 func (v *Validator) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) {
diff --git a/images/virtualization-artifact/pkg/monitoring/metrics/vdsnapshot/data_metric.go b/images/virtualization-artifact/pkg/monitoring/metrics/vdsnapshot/data_metric.go
index 72f0a4e223..95928c3be7 100644
--- a/images/virtualization-artifact/pkg/monitoring/metrics/vdsnapshot/data_metric.go
+++ b/images/virtualization-artifact/pkg/monitoring/metrics/vdsnapshot/data_metric.go
@@ -21,10 +21,11 @@ import (
 )
 
 type dataMetric struct {
-	Name      string
-	Namespace string
-	UID       string
-	Phase     v1alpha2.VirtualDiskSnapshotPhase
+	Name        string
+	Namespace   string
+	UID         string
+	Phase       v1alpha2.VirtualDiskSnapshotPhase
+	VirtualDisk string
 }
 
 // DO NOT mutate VirtualDiskSnapshot!
@@ -34,9 +35,10 @@ func newDataMetric(vds *v1alpha2.VirtualDiskSnapshot) *dataMetric {
 	}
 
 	return &dataMetric{
-		Name:      vds.Name,
-		Namespace: vds.Namespace,
-		UID:       string(vds.UID),
-		Phase:     vds.Status.Phase,
+		Name:        vds.Name,
+		Namespace:   vds.Namespace,
+		UID:         string(vds.UID),
+		Phase:       vds.Status.Phase,
+		VirtualDisk: vds.Spec.VirtualDiskName,
 	}
 }
diff --git a/images/virtualization-artifact/pkg/monitoring/metrics/vdsnapshot/metrics.go b/images/virtualization-artifact/pkg/monitoring/metrics/vdsnapshot/metrics.go
index 81d8ae8ed2..9a2f881260 100644
--- a/images/virtualization-artifact/pkg/monitoring/metrics/vdsnapshot/metrics.go
+++ b/images/virtualization-artifact/pkg/monitoring/metrics/vdsnapshot/metrics.go
@@ -24,6 +24,7 @@ import (
 
 const (
 	MetricVDSnapshotStatusPhase = "virtualdisksnapshot_status_phase"
+	MetricVDSnapshotInfo        = "virtualdisksnapshot_info"
 )
 
 var baseLabels = []string{"name", "namespace", "uid"}
@@ -52,4 +53,12 @@ var vdsnapshotMetrics = map[string]metrics.MetricInfo{
 		WithBaseLabels("phase"),
 		nil,
 	),
+
+	MetricVDSnapshotInfo: metrics.NewMetricInfo(
+		MetricVDSnapshotInfo,
+		"The virtualdisksnapshot virtualdisk name.",
+		prometheus.GaugeValue,
+		WithBaseLabels("virtualdisk"),
+		nil,
+	),
 }
diff --git a/images/virtualization-artifact/pkg/monitoring/metrics/vdsnapshot/scraper.go b/images/virtualization-artifact/pkg/monitoring/metrics/vdsnapshot/scraper.go
index e387c65ab1..b4a8081df4 100644
--- a/images/virtualization-artifact/pkg/monitoring/metrics/vdsnapshot/scraper.go
+++ b/images/virtualization-artifact/pkg/monitoring/metrics/vdsnapshot/scraper.go
@@ -37,6 +37,7 @@ type scraper struct {
 
 func (s *scraper) Report(m *dataMetric) {
 	s.updateMetricVDSnapshotStatusPhase(m)
+	s.updateMetricVDSnapshotInfo(m)
 }
 
 func (s *scraper) updateMetricVDSnapshotStatusPhase(m *dataMetric) {
@@ -61,6 +62,10 @@ func (s *scraper) updateMetricVDSnapshotStatusPhase(m *dataMetric) {
 	}
 }
 
+func (s *scraper) updateMetricVDSnapshotInfo(m *dataMetric) {
+	s.defaultUpdate(MetricVDSnapshotInfo, 1, m, m.VirtualDisk)
+}
+
 func (s *scraper) defaultUpdate(descName string, value float64, m *dataMetric, labels ...string) {
 	info := vdsnapshotMetrics[descName]
 	metric, err := prometheus.NewConstMetric(
diff --git a/images/virtualization-artifact/pkg/monitoring/metrics/vmsnapshot/data_metric.go b/images/virtualization-artifact/pkg/monitoring/metrics/vmsnapshot/data_metric.go
index 297da2ca09..a21f34caba 100644
--- a/images/virtualization-artifact/pkg/monitoring/metrics/vmsnapshot/data_metric.go
+++ b/images/virtualization-artifact/pkg/monitoring/metrics/vmsnapshot/data_metric.go
@@ -21,10 +21,11 @@ import (
 )
 
 type dataMetric struct {
-	Name      string
-	Namespace string
-	UID       string
-	Phase     v1alpha2.VirtualMachineSnapshotPhase
+	Name           string
+	Namespace      string
+	UID            string
+	Phase          v1alpha2.VirtualMachineSnapshotPhase
+	VirtualMachine string
 }
 
 // DO NOT mutate VirtualMachineSnapshot!
@@ -34,9 +35,10 @@ func newDataMetric(vms *v1alpha2.VirtualMachineSnapshot) *dataMetric {
 	}
 
 	return &dataMetric{
-		Name:      vms.Name,
-		Namespace: vms.Namespace,
-		UID:       string(vms.UID),
-		Phase:     vms.Status.Phase,
+		Name:           vms.Name,
+		Namespace:      vms.Namespace,
+		UID:            string(vms.UID),
+		Phase:          vms.Status.Phase,
+		VirtualMachine: vms.Spec.VirtualMachineName,
 	}
 }
diff --git a/images/virtualization-artifact/pkg/monitoring/metrics/vmsnapshot/metrics.go b/images/virtualization-artifact/pkg/monitoring/metrics/vmsnapshot/metrics.go
index 1df4c19253..b6e763a907 100644
--- a/images/virtualization-artifact/pkg/monitoring/metrics/vmsnapshot/metrics.go
+++ b/images/virtualization-artifact/pkg/monitoring/metrics/vmsnapshot/metrics.go
@@ -24,6 +24,7 @@ import (
 
 const (
 	MetricVMSnapshotStatusPhase = "virtualmachinesnapshot_status_phase"
+	MetricVMSnapshotInfo        = "virtualmachinesnapshot_info"
 )
 
 var baseLabels = []string{"name", "namespace", "uid"}
@@ -52,4 +53,12 @@ var vmsnapshotMetrics = map[string]metrics.MetricInfo{
 		WithBaseLabels("phase"),
 		nil,
 	),
+
+	MetricVMSnapshotInfo: metrics.NewMetricInfo(
+		MetricVMSnapshotInfo,
+		"The virtualmachinesnapshot virtualmachine name.",
+		prometheus.GaugeValue,
+		WithBaseLabels("virtualmachine"),
+		nil,
+	),
 }
diff --git a/images/virtualization-artifact/pkg/monitoring/metrics/vmsnapshot/scraper.go b/images/virtualization-artifact/pkg/monitoring/metrics/vmsnapshot/scraper.go
index 2d2e4b63b6..d1702c367d 100644
--- a/images/virtualization-artifact/pkg/monitoring/metrics/vmsnapshot/scraper.go
+++ b/images/virtualization-artifact/pkg/monitoring/metrics/vmsnapshot/scraper.go
@@ -37,6 +37,7 @@ type scraper struct {
 
 func (s *scraper) Report(m *dataMetric) {
 	s.updateMetricVMSnapshotStatusPhase(m)
+	s.updateMetricVMSnapshotInfo(m)
 }
 
 func (s *scraper) updateMetricVMSnapshotStatusPhase(m *dataMetric) {
@@ -61,6 +62,10 @@ func (s *scraper) updateMetricVMSnapshotStatusPhase(m *dataMetric) {
 	}
 }
 
+func (s *scraper) updateMetricVMSnapshotInfo(m *dataMetric) {
+	s.defaultUpdate(MetricVMSnapshotInfo, 1, m, m.VirtualMachine)
+}
+
 func (s *scraper) defaultUpdate(descName string, value float64, m *dataMetric, labels ...string) {
 	info := vmsnapshotMetrics[descName]
 	metric, err := prometheus.NewConstMetric(
diff --git a/tests/e2e/complex_test.go b/tests/e2e/complex_test.go
index 6100e0ec6f..138f620911 100644
--- a/tests/e2e/complex_test.go
+++ b/tests/e2e/complex_test.go
@@ -30,6 +30,8 @@ import (
 	kc "github.com/deckhouse/virtualization/tests/e2e/kubectl"
 )
 
+const VirtualMachineCount = 12
+
 var _ = Describe("ComplexTest", Serial, framework.CommonE2ETestDecorators(), func() {
 	var (
 		testCaseLabel            = map[string]string{"testcase": "complex-test"}
@@ -38,6 +40,7 @@ var _ = Describe("ComplexTest", Serial, framework.CommonE2ETestDecorators(), fun
 		notAlwaysOnLabel         = map[string]string{"notAlwaysOn": "complex-test"}
 		ns                       string
 		phaseByVolumeBindingMode = GetPhaseByVolumeBindingModeForTemplateSc()
+		f                        = framework.NewFramework("")
 	)
 
 	AfterEach(func() {
@@ -78,7 +81,10 @@ var _ = Describe("ComplexTest", Serial, framework.CommonE2ETestDecorators(), fun
 		})
 
 		It("should fill empty virtualMachineClassName with the default class name", func() {
-			defaultVMLabels := testCaseLabel
+			defaultVMLabels := make(map[string]string, len(testCaseLabel)+1)
+			for k, v := range testCaseLabel {
+				defaultVMLabels[k] = v
+			}
 			defaultVMLabels["vm"] = "default"
 			res := kubectl.List(kc.ResourceVM, kc.GetOptions{
 				Labels:    testCaseLabel,
@@ -125,13 +131,12 @@ var _ = Describe("ComplexTest", Serial, framework.CommonE2ETestDecorators(), fun
 	})
 
 	Context("When virtual machines IP addresses are applied", func() {
-		// TODO: fix: the custom IP address loses its lease and becomes Lost.
-		// It("patches custom VMIP with unassigned address", func() {
-		// 	vmipName := fmt.Sprintf("%s-%s", namePrefix, "vm-custom-ip")
-		// 	Eventually(func() error {
-		// 		return AssignIPToVMIP(f, ns, vmipName)
-		// 	}).WithTimeout(LongWaitDuration).WithPolling(Interval).Should(Succeed())
-		// })
+		It("patches custom VMIP with unassigned address", func() {
+			vmipName := fmt.Sprintf("%s-%s", namePrefix, "vm-custom-ip")
+			Eventually(func() error {
+				return AssignIPToVMIP(f, ns, vmipName)
+			}).WithTimeout(LongWaitDuration).WithPolling(Interval).Should(Succeed())
+		})
 
 		It("checks VMIPs phases", func() {
 			By(fmt.Sprintf("VMIPs should be in %s phases", PhaseAttached))
@@ -219,6 +224,7 @@ var _ = Describe("ComplexTest", Serial, framework.CommonE2ETestDecorators(), fun
 					Namespace: ns,
 				})
 				Expect(err).ShouldNot(HaveOccurred())
+				Expect(len(vmList.Items)).To(Equal(VirtualMachineCount))
 
 				for _, vmObj := range vmList.Items {
 					if vmObj.Spec.RunPolicy == v1alpha2.AlwaysOnPolicy {
@@ -278,6 +284,7 @@ var _ = Describe("ComplexTest", Serial, framework.CommonE2ETestDecorators(), fun
 					Labels:    testCaseLabel,
 				})
 				Expect(err).NotTo(HaveOccurred())
+				Expect(len(vms.Items)).To(Equal(VirtualMachineCount))
 
 				var notAlwaysOnVMs []string
 				for _, vm := range vms.Items {
@@ -313,6 +320,7 @@ var _ = Describe("ComplexTest", Serial, framework.CommonE2ETestDecorators(), fun
 					Namespace: ns,
 				})
 				Expect(err).ShouldNot(HaveOccurred())
+				Expect(len(vmList.Items)).To(Equal(VirtualMachineCount))
 
 				alwaysOnVMs = []string{}
 				notAlwaysOnVMs = []string{}
diff --git a/tests/e2e/default_config.yaml b/tests/e2e/default_config.yaml
index a42268ddfe..2493a8d3e5 100644
--- a/tests/e2e/default_config.yaml
+++ b/tests/e2e/default_config.yaml
@@ -48,9 +48,7 @@ logFilter:
   - "the server rejected our request due to an error in our request" # Err.
   - "failed to sync powerstate" # Msg.
   - "does not have a pvc reference" # "err": "kvvm head-345e7b6a-testcases-image-hotplug/head-345e7b6a-vm-image-hotplug spec volume vi-head-345e7b6a-vi-alpine-http does not have a pvc reference"
-  - "lastTransitionTime: Required value" # Err.
   - "virtualmachineipaddressleases.virtualization.deckhouse.io "
-  - "Forbidden: no new finalizers can be added if the object is being deleted, found new finalizers"
   - "Failed to watch" # error if virtualization-controller restarts during tests. "msg": "Failed to watch", "err": "Get \"http://127.0.0.1:23915/apis/virtualization.deckhouse.io/v1alpha2/virtualmachinerestores?allowWatchBookmarks=true\u0026resourceVersion=709816257\u0026timeoutSeconds=310\u0026watch=true\": context canceled"
   - "leader election lost"
   - "a virtual machine cannot be restored from the pending phase with `Forced` mode" # "err": "a virtual machine cannot be restored from the pending phase with `Forced` mode; you can delete the virtual machine and restore it with `Safe` mode"
diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go
index e310d150d7..453350d210 100644
--- a/tests/e2e/e2e_test.go
+++ b/tests/e2e/e2e_test.go
@@ -293,7 +293,7 @@ func (c *controllerRestartChecker) Check() error {
 	for _, pod := range pods.Items {
 		foundContainer := false
 		for _, containerStatus := range pod.Status.ContainerStatuses {
-			if containerStatus.Name == VirtualizationController {
+			if containerStatus.Name == VirtualizationController && containerStatus.State.Running != nil {
 				foundContainer = true
 				if containerStatus.State.Running.StartedAt.After(c.startedAt.Time) {
 					errs = errors.Join(errs, fmt.Errorf("the container %q was restarted: %s", VirtualizationController, pod.Name))
diff --git a/tests/e2e/images_creation_test.go b/tests/e2e/images_creation_test.go
index b83a6c4881..949b7a91b6 100644
--- a/tests/e2e/images_creation_test.go
+++ b/tests/e2e/images_creation_test.go
@@ -33,6 +33,7 @@ var _ = Describe("VirtualImageCreation", framework.CommonE2ETestDecorators(), fu
 	var (
 		testCaseLabel = map[string]string{"testcase": "images-creation"}
 		ns            string
+		criticalError error
 	)
 
 	BeforeAll(func() {
@@ -73,6 +74,12 @@ var _ = Describe("VirtualImageCreation", framework.CommonE2ETestDecorators(), fu
 		}
 	})
 
+	BeforeEach(func() {
+		if criticalError != nil {
+			Skip(fmt.Sprintf("Skip because blinking error: %s", criticalError.Error()))
+		}
+	})
+
 	Context("When resources are applied", func() {
 		It("result should be succeeded", func() {
 			res := kubectl.Apply(kc.ApplyOptions{
@@ -106,11 +113,16 @@ var _ = Describe("VirtualImageCreation", framework.CommonE2ETestDecorators(), fu
 	Context("When virtual images are applied", func() {
 		It("checks VIs phases", func() {
 			By(fmt.Sprintf("VIs should be in %s phases", v1alpha2.ImageReady))
-			WaitPhaseByLabel(kc.ResourceVI, string(v1alpha2.ImageReady), kc.WaitOptions{
-				Labels:    testCaseLabel,
-				Namespace: ns,
-				Timeout:   MaxWaitTimeout,
+			err := InterceptGomegaFailure(func() {
+				WaitPhaseByLabel(kc.ResourceVI, string(v1alpha2.ImageReady), kc.WaitOptions{
+					Labels:    testCaseLabel,
+					Namespace: ns,
+					Timeout:   MaxWaitTimeout,
+				})
 			})
+			if err != nil {
+				criticalError = err
+			}
 		})
 
 		It("checks CVIs phases", func() {
diff --git a/tests/e2e/testdata/complex-test/vm/kustomization.yaml b/tests/e2e/testdata/complex-test/vm/kustomization.yaml
index 715388ea25..b80c13bc87 100644
--- a/tests/e2e/testdata/complex-test/vm/kustomization.yaml
+++ b/tests/e2e/testdata/complex-test/vm/kustomization.yaml
@@ -4,8 +4,7 @@ resources:
   - overlays/default
   - overlays/always-on
   - overlays/embedded-cloudinit
-  # TODO: the custom IP address loses its lease and becomes Lost.
-  # - overlays/custom-ip
+  - overlays/custom-ip
   - overlays/automatic
   - overlays/automatic-with-hotplug
   - overlays/hotplug
diff --git a/tests/e2e/testdata/vm-restore-force/vm/base/kustomization.yaml b/tests/e2e/testdata/vm-restore-force/vm/base/kustomization.yaml
index 7eb3b5f7a5..3202d4d010 100644
--- a/tests/e2e/testdata/vm-restore-force/vm/base/kustomization.yaml
+++ b/tests/e2e/testdata/vm-restore-force/vm/base/kustomization.yaml
@@ -5,8 +5,7 @@ resources:
   - ./vd-root.yaml
   - ./vd-blank.yaml
   - ./vmbda-vd.yaml
-# When vmbda is deleted, it may stay in Terminating; a fix is planned.
-# - ./vmbda-vi.yaml
+  - ./vmbda-vi.yaml
 configurations:
   - transformer.yaml
 generatorOptions:
diff --git a/tests/e2e/util_test.go b/tests/e2e/util_test.go
index 0b9ed59565..e52768c980 100644
--- a/tests/e2e/util_test.go
+++ b/tests/e2e/util_test.go
@@ -341,13 +341,13 @@ func WaitResources(resources []string, resource kc.Resource, opts kc.WaitOptions
 			res := kubectl.WaitResource(resource, name, waitOpts)
 			if res.Error() != nil {
 				mu.Lock()
-				waitErr = append(waitErr, fmt.Sprintf("cmd: %s\nstderr: %s", res.GetCmd(), res.StdErr()))
+				waitErr = append(waitErr, fmt.Sprintf("cmd: %s\nstderr: %s\nwaited for: %s", res.GetCmd(), res.StdErr(), opts.For))
 				mu.Unlock()
 			}
 		}()
 	}
 	wg.Wait()
-	Expect(waitErr).To(BeEmpty())
+	Expect(waitErr).To(BeEmpty(), "should observe resources in '%s' state before %s timeout", opts.For, opts.Timeout.String())
 }
 
 func GetStorageClassFromEnv(envName string) (*storagev1.StorageClass, error) {
diff --git a/tests/e2e/vd_snapshots_test.go b/tests/e2e/vd_snapshots_test.go
index 67404020a9..82fe242aae 100644
--- a/tests/e2e/vd_snapshots_test.go
+++ b/tests/e2e/vd_snapshots_test.go
@@ -49,9 +49,14 @@ var _ = Describe("VirtualDiskSnapshots", framework.CommonE2ETestDecorators(), fu
 		hasNoConsumerLabel       = map[string]string{"hasNoConsumer": "vd-snapshots"}
 		vmAutomaticWithHotplug   = map[string]string{"vm": "automatic-with-hotplug"}
 		ns                       string
+		criticalErr              error
 	)
 
 	BeforeAll(func() {
+		if criticalErr != nil {
+			Skip(fmt.Sprintf("Skip because blinking error: %s", criticalErr.Error()))
+		}
+
 		if config.IsReusable() {
 			Skip("Test not available in REUSABLE mode: not supported yet.")
 		}
@@ -288,20 +293,25 @@ var _ = Describe("VirtualDiskSnapshots", framework.CommonE2ETestDecorators(), fu
 			maps.Copy(labels, attachedVirtualDiskLabel)
 			maps.Copy(labels, testCaseLabel)
 
-			Eventually(func() error {
-				vdSnapshots := GetVirtualDiskSnapshots(ns, labels)
-				for _, snapshot := range vdSnapshots.Items {
-					if snapshot.Status.Phase == v1alpha2.VirtualDiskSnapshotPhaseReady || snapshot.DeletionTimestamp != nil {
-						continue
+			err := InterceptGomegaFailure(func() {
+				Eventually(func() error {
+					vdSnapshots := GetVirtualDiskSnapshots(ns, labels)
+					for _, snapshot := range vdSnapshots.Items {
+						if snapshot.Status.Phase == v1alpha2.VirtualDiskSnapshotPhaseReady || snapshot.DeletionTimestamp != nil {
+							continue
+						}
+						return errors.New("still wait for all snapshots either in ready or in deletion state")
 					}
-					return errors.New("still wait for all snapshots either in ready or in deletion state")
-				}
-				return nil
-			}).WithTimeout(
-				LongWaitDuration,
-			).WithPolling(
-				Interval,
-			).Should(Succeed(), "all snapshots should be in ready state after creation")
+					return nil
+				}).WithTimeout(
+					LongWaitDuration,
+				).WithPolling(
+					Interval,
+				).Should(Succeed(), "all snapshots should be in ready state after creation")
+			})
+			if err != nil {
+				criticalErr = err
+			}
 		})
 
 		// TODO: It is a known issue that disk snapshots are not always created consistently. To prevent this error from causing noise during testing, we disabled this check. It will need to be re-enabled once the consistency issue is fixed.
diff --git a/tests/e2e/vm_live_migration_tcp_session_test.go b/tests/e2e/vm_live_migration_tcp_session_test.go
index f5da80a9c9..e790f91408 100644
--- a/tests/e2e/vm_live_migration_tcp_session_test.go
+++ b/tests/e2e/vm_live_migration_tcp_session_test.go
@@ -63,18 +63,28 @@ var _ = Describe("VirtualMachineLiveMigrationTCPSession", SIGMigration(), framew
 
 		f            = framework.NewFramework(testCaseLabelValue)
 		storageClass = framework.GetConfig().StorageClass.TemplateStorageClass
+		testSkipped  bool
 	)
 
+	BeforeAll(func() {
+		// TODO: The test is being disabled because running it with the ginkgo `--race` option detects a race condition.
+		// This leads to unstable test execution. Remove Skip after fixing the issue.
+		testSkipped = true
+		Skip("This test case is not working everytime. Should be fixed.")
+	})
+
 	f.BeforeAll()
 	f.AfterAll()
 
 	AfterEach(func() {
-		if CurrentSpecReport().Failed() {
-			SaveTestCaseDump(map[string]string{testCaseLabel: testCaseLabelValue}, CurrentSpecReport().LeafNodeText, f.Namespace().Name)
-			SaveIPerfClientReport(testCaseLabelValue, rawReport)
-		}
+		if !testSkipped {
+			if CurrentSpecReport().Failed() {
+				SaveTestCaseDump(map[string]string{testCaseLabel: testCaseLabelValue}, CurrentSpecReport().LeafNodeText, f.Namespace().Name)
+				SaveIPerfClientReport(testCaseLabelValue, rawReport)
+			}
 
-		cancel()
+			cancel()
+		}
 	})
 
 	It("checks TCP connection", func() {