diff --git a/charts/library/common/schemas/images/alpineImage.json b/charts/library/common/schemas/images/alpineImage.json
deleted file mode 100644
index 4b287ca250fcd..0000000000000
--- a/charts/library/common/schemas/images/alpineImage.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "type": "object",
-  "properties": {
-    "repository": {
-      "type": "string",
-      "description": "Configuration for `alpineImage.repository`."
-    },
-    "tag": {
-      "type": "string",
-      "description": "Configuration for `alpineImage.tag`."
-    },
-    "pullPolicy": {
-      "type": "string",
-      "description": "Configuration for `alpineImage.pullPolicy`."
-    }
-  },
-  "additionalProperties": true,
-  "description": "Configuration for `alpineImage`."
-}
diff --git a/charts/library/common/schemas/images/openvpnImage.json b/charts/library/common/schemas/images/openvpnImage.json
deleted file mode 100644
index 759ee11e76f26..0000000000000
--- a/charts/library/common/schemas/images/openvpnImage.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "type": "object",
-  "properties": {
-    "repository": {
-      "type": "string",
-      "description": "Configuration for `openvpnImage.repository`."
-    },
-    "tag": {
-      "type": "string",
-      "description": "Configuration for `openvpnImage.tag`."
-    },
-    "pullPolicy": {
-      "type": "string",
-      "description": "Configuration for `openvpnImage.pullPolicy`."
-    }
-  },
-  "additionalProperties": true,
-  "description": "Configuration for `openvpnImage`."
-}
diff --git a/charts/library/common/schemas/images/redisClientImage.json b/charts/library/common/schemas/images/redisClientImage.json
deleted file mode 100644
index 74a94fff53763..0000000000000
--- a/charts/library/common/schemas/images/redisClientImage.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "type": "object",
-  "properties": {
-    "repository": {
-      "type": "string",
-      "description": "Configuration for `redisClientImage.repository`."
-    },
-    "tag": {
-      "type": "string",
-      "description": "Configuration for `redisClientImage.tag`."
-    },
-    "pullPolicy": {
-      "type": "string",
-      "description": "Configuration for `redisClientImage.pullPolicy`."
-    }
-  },
-  "additionalProperties": true,
-  "description": "Configuration for `redisClientImage`."
-}
diff --git a/charts/library/common/schemas/images/scratchImage.json b/charts/library/common/schemas/images/scratchImage.json
deleted file mode 100644
index d992f69617dd9..0000000000000
--- a/charts/library/common/schemas/images/scratchImage.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "type": "object",
-  "properties": {
-    "repository": {
-      "type": "string",
-      "description": "Configuration for `scratchImage.repository`."
-    },
-    "tag": {
-      "type": "string",
-      "description": "Configuration for `scratchImage.tag`."
-    },
-    "pullPolicy": {
-      "type": "string",
-      "description": "Configuration for `scratchImage.pullPolicy`."
-    }
-  },
-  "additionalProperties": true,
-  "description": "Configuration for `scratchImage`."
-}
diff --git a/charts/library/common/schemas/images/wgetImage.json b/charts/library/common/schemas/images/wgetImage.json
deleted file mode 100644
index 76cc5afc88ee0..0000000000000
--- a/charts/library/common/schemas/images/wgetImage.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "type": "object",
-  "properties": {
-    "repository": {
-      "type": "string",
-      "description": "Configuration for `wgetImage.repository`."
-    },
-    "tag": {
-      "type": "string",
-      "description": "Configuration for `wgetImage.tag`."
-    },
-    "pullPolicy": {
-      "type": "string",
-      "description": "Configuration for `wgetImage.pullPolicy`."
-    }
-  },
-  "additionalProperties": true,
-  "description": "Configuration for `wgetImage`."
-}
diff --git a/charts/library/common/schemas/images/wireguardImage.json b/charts/library/common/schemas/images/wireguardImage.json
deleted file mode 100644
index 0e41308ceccad..0000000000000
--- a/charts/library/common/schemas/images/wireguardImage.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "type": "object",
-  "properties": {
-    "repository": {
-      "type": "string",
-      "description": "Configuration for `wireguardImage.repository`."
-    },
-    "tag": {
-      "type": "string",
-      "description": "Configuration for `wireguardImage.tag`."
-    },
-    "pullPolicy": {
-      "type": "string",
-      "description": "Configuration for `wireguardImage.pullPolicy`."
-    }
-  },
-  "additionalProperties": true,
-  "description": "Configuration for `wireguardImage`."
-}
diff --git a/charts/library/common/schemas/images/yqImage.json b/charts/library/common/schemas/images/yqImage.json
deleted file mode 100644
index 91f7f0e9c41af..0000000000000
--- a/charts/library/common/schemas/images/yqImage.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "type": "object",
-  "properties": {
-    "pullPolicy": {
-      "type": "string",
-      "description": "Configuration for `yqImage.pullPolicy`."
-    },
-    "repository": {
-      "type": "string",
-      "description": "Configuration for `yqImage.repository`."
-    },
-    "tag": {
-      "type": "string",
-      "description": "Configuration for `yqImage.tag`."
-    }
-  },
-  "additionalProperties": true,
-  "description": "Configuration for `yqImage`."
-}
diff --git a/charts/library/common/templates/lib/dependencies/_dbWait.tpl b/charts/library/common/templates/lib/dependencies/_dbWait.tpl
index 427db7159a752..7c79e0cd3b744 100644
--- a/charts/library/common/templates/lib/dependencies/_dbWait.tpl
+++ b/charts/library/common/templates/lib/dependencies/_dbWait.tpl
@@ -236,7 +236,7 @@ command:
 {{- define "tc.v1.common.lib.deps.wait.clickhouse" -}}
 enabled: true
 type: system
-imageSelector: wgetImage
+imageSelector: ubuntuImage
 securityContext:
   runAsUser: 568
   runAsGroup: 568
@@ -280,7 +280,7 @@ args:
 {{- define "tc.v1.common.lib.deps.wait.solr" -}}
 enabled: true
 type: system
-imageSelector: wgetImage
+imageSelector: ubuntuImage
 securityContext:
   runAsUser: 568
   runAsGroup: 568
diff --git a/charts/library/common/values.schema.json b/charts/library/common/values.schema.json
index 12b3a1739a2ef..ddb6b384c4edc 100644
--- a/charts/library/common/values.schema.json
+++ b/charts/library/common/values.schema.json
@@ -144,30 +144,14 @@
       "$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/codeserverImage.json",
       "description": "Configuration for `codeserverImage`."
     },
-    "alpineImage": {
-      "$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/alpineImage.json",
-      "description": "Configuration for `alpineImage`."
-    },
     "ubuntuImage": {
       "$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/ubuntuImage.json",
       "description": "Configuration for `ubuntuImage`."
     },
-    "scratchImage": {
-      "$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/scratchImage.json",
-      "description": "Configuration for `scratchImage`."
-    },
     "kubectlImage": {
       "$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/kubectlImage.json",
       "description": "Configuration for `kubectlImage`."
     },
-    "wgetImage": {
-      "$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/wgetImage.json",
-      "description": "Configuration for `wgetImage`."
-    },
-    "yqImage": {
-      "$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/yqImage.json",
-      "description": "Configuration for `yqImage`."
-    },
     "postgresClientImage": {
       "$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/postgresClientImage.json",
       "description": "Configuration for `postgresClientImage`."
@@ -176,10 +160,6 @@
       "$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/mariadbClientImage.json",
       "description": "Configuration for `mariadbClientImage`."
     },
-    "redisClientImage": {
-      "$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/redisClientImage.json",
-      "description": "Configuration for `redisClientImage`."
-    },
     "valkeyClientImage": {
       "$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/valkeyClientImage.json",
       "description": "Configuration for `valkeyClientImage`."
@@ -220,14 +200,6 @@
       "$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/postgresVectorchord16Image.json",
       "description": "Configuration for `postgresVectorchord16Image`."
     },
-    "openvpnImage": {
-      "$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/openvpnImage.json",
-      "description": "Configuration for `openvpnImage`."
-    },
-    "wireguardImage": {
-      "$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/wireguardImage.json",
-      "description": "Configuration for `wireguardImage`."
-    },
     "ingress": {
       "$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/ingress.json",
       "description": "Create Ingress objects"