diff --git a/keycloak-db-values.yaml b/keycloak-db-values.yaml
index a055cd2..a224b6b 100644
--- a/keycloak-db-values.yaml
+++ b/keycloak-db-values.yaml
@@ -36,8 +36,8 @@ readReplicas:
 metrics:
   enabled: true
   image:
-    repository: ${repository}
-    tag: ${exporter_tag}
+    repository:
+    tag:
 
 persistence:
   enabled: true
diff --git a/main.tf b/main.tf
index 9805d54..093a1c8 100644
--- a/main.tf
+++ b/main.tf
@@ -106,29 +106,28 @@ resource "helm_release" "keycloak-db" {
   ]
 
   set {
-    name  = "image.registry"
-    value = module.images.images[local.postgresql_key].dest_registry
-  }
-  set {
-    name  = "image.repository"
-    value = module.images.images[local.postgresql_key].dest_repository
+    name = "image.repository"
+    value = format("%v/%v",
+      module.images.images[local.postgresql_key].dest_registry,
+      module.images.images[local.postgresql_key].dest_repository
+    )
   }
+
   set {
     name  = "image.tag"
-    value = var.postgresql_tag
+    value = module.images.images[local.postgresql_key].tag
   }
 
   set {
-    name  = "metrics.image.registry"
-    value = module.images.images[local.postgres_exporter_key].dest_registry
-  }
-  set {
-    name  = "metrics.image.repository"
-    value = module.images.images[local.postgres_exporter_key].dest_registry
+    name = "metrics.image.repository"
+    value = format("%v/%v",
+      module.images.images[local.postgres_exporter_key].dest_registry,
+      module.images.images[local.postgres_exporter_key].dest_repository
+    )
   }
   set {
     name  = "metrics.image.tag"
-    value = var.postgres_exporter_tag
+    value = module.images.images[local.postgres_exporter_key].tag
   }
 }