diff --git a/main.tf b/main.tf
index 36082d1..c436ac3 100644
--- a/main.tf
+++ b/main.tf
@@ -50,21 +50,15 @@ resource "helm_release" "prometheus" {
   # Prometheus chart:
   set {
     name = "configmapReload.prometheus.image.repository"
-    value = format("%v/%v",
-      module.images.images[local.prom_config_reload_key].dest_registry,
-      module.images.images[local.prom_config_reload_key].dest_repository
-    )
+    value = split(":", module.images.images[local.prom_config_reload_key].dest_full_path)[0]
   }
   set {
     name  = "configmapReload.prometheus.image.tag"
-    value = module.images.images[local.prom_config_reload_key].tag
+    value = split(":", module.images.images[local.prom_config_reload_key].dest_full_path)[1]
   }
   set {
     name = "server.image.repository"
-    value = format("%v/%v",
-      module.images.images[local.prom_key].dest_registry,
-      module.images.images[local.prom_key].dest_repository
-    )
+    value = split(":", module.images.images[local.prom_key].dest_full_path)[0]
   }
   set {
     name  = "server.image.tag"
@@ -78,10 +72,7 @@ resource "helm_release" "prometheus" {
   # alertmanager subchart:
   set {
     name = "alertmanager.image.repository"
-    value = format("%v/%v",
-      module.images.images[local.alertman_key].dest_registry,
-      module.images.images[local.alertman_key].dest_repository
-    )
+    value = split(":", module.images.images[local.alertman_key].dest_full_path)[0]
   }
   set {
     name  = "alertmanager.image.tag"
@@ -89,10 +80,7 @@ resource "helm_release" "prometheus" {
   }
   set {
     name = "alertmanager.configmapReload.image.repository"
-    value = format("%v/%v",
-      module.images.images[local.prom_config_reload_key].dest_registry,
-      module.images.images[local.prom_config_reload_key].dest_repository
-    )
+    value = split(":", module.images.images[local.prom_config_reload_key].dest_full_path)[0]
   }
   set {
     name  = "alertmanager.configmapReload.image.tag"
@@ -104,12 +92,13 @@ resource "helm_release" "prometheus" {
   }
 
   # kube-state-metrics subchart:
+  set {
+    name = "kube-state-metrics.image.registry"
+    value = module.images.images[local.ksm_key].dest_registry
+  }
   set {
     name = "kube-state-metrics.image.repository"
-    value = format("%v/%v",
-      module.images.images[local.ksm_key].dest_registry,
-      module.images.images[local.ksm_key].dest_repository
-    )
+    value = module.images.images[local.ksm_key].dest_repository
   }
   set {
     name  = "kube-state-metrics.image.tag"
@@ -118,11 +107,12 @@ resource "helm_release" "prometheus" {
 
   # prometheus-node-exporter subject:
   set {
-    name = "prometheus-node-exporter.image.repository"
-    value = format("%v/%v",
-      module.images.images[local.node_exporter_key].dest_registry,
-      module.images.images[local.node_exporter_key].dest_repository
-    )
+    name  = "prometheus-node-exporter.image.registry"
+    value = module.images.images[local.node_exporter_key].dest_registry
+  }
+  set {
+    name  = "prometheus-node-exporter.image.repository"
+    value =  module.images.images[local.node_exporter_key].dest_repository
   }
   set {
     name  = "prometheus-node-exporter.image.tag"
@@ -132,10 +122,7 @@ resource "helm_release" "prometheus" {
   # prometheus-pushgateway
   set {
     name = "prometheus-pushgateway.image.repository"
-    value = format("%v/%v",
-      module.images.images[local.pushgateway_key].dest_registry,
-      module.images.images[local.pushgateway_key].dest_repository
-    )
+    value = split(":", module.images.images[local.pushgateway_key].dest_full_path)[0]
   }
   set {
     name  = "prometheus-pushgateway.image.tag"
diff --git a/variables.tf b/variables.tf
index 57f3b02..b3a8ffe 100644
--- a/variables.tf
+++ b/variables.tf
@@ -56,7 +56,7 @@ variable "alertmanager_tag" {
 variable "kube_state_metrics_tag" {
   description = "The image tag of the kube-state-metrics image."
   type        = string
-  default     = "2.10.0"
+  default     = "v2.6.0"
 }
 
 # The `APP VERSION` of the output:
@@ -64,7 +64,7 @@ variable "kube_state_metrics_tag" {
 variable "node_exporter_tag" {
   description = "The image tag of the node-exporter image."
   type        = string
-  default     = "1.6.1"
+  default     = "v1.8.1"
 }
 
 # The `APP VERSION` of the output:
@@ -78,5 +78,5 @@ variable "pushgateway_tag" {
 variable "rwo_storage_class" {
   description = "Specify the storage class for read/write/once persistent volumes."
   type        = string
-  default     = "gp3"
+  default     = "gp3-encrypted"
 }