diff --git a/examples/full-cluster-tf-upgrade/1.25/common-services/variables.common-services.auto.tfvars b/examples/full-cluster-tf-upgrade/1.25/common-services/variables.common-services.auto.tfvars
index f969ef4..1d80214 100644
--- a/examples/full-cluster-tf-upgrade/1.25/common-services/variables.common-services.auto.tfvars
+++ b/examples/full-cluster-tf-upgrade/1.25/common-services/variables.common-services.auto.tfvars
@@ -39,94 +39,3 @@ chart_details = {
     use_remote = true
   }
 }
-
-image_details = {
-  "cert-manager-controller" = {
-    name            = "cert-manager-controller"
-    image           = "quay.io/jetstack/cert-manager-controller"
-    source_registry = "quay.io"
-    source_image    = "jetstack/cert-manager-controller"
-    source_tag      = "v1.12.2"
-    enabled         = true
-  }
-  "cert-manager-cainjector" = {
-    name            = "cert-manager-cainjector"
-    image           = "quay.io/jetstack/cert-manager-cainjector"
-    source_registry = "quay.io"
-    source_image    = "jetstack/cert-manager-cainjector"
-    source_tag      = "v1.12.2"
-    enabled         = true
-  }
-  "cert-manager-webhook" = {
-    name            = "cert-manager-webhook"
-    image           = "quay.io/jetstack/cert-manager-webhook"
-    source_registry = "quay.io"
-    source_image    = "jetstack/cert-manager-webhook"
-    source_tag      = "v1.12.2"
-    enabled         = true
-  }
-  "cluster-autoscaler" = {
-    name            = "cluster-autoscaler"
-    image           = "registry.k8s.io/autoscaling/cluster-autoscaler"
-    source_registry = "registry.k8s.io"
-    source_image    = "autoscaling/cluster-autoscaler"
-    source_tag      = "v1.24.0"
-    enabled         = true
-  }
-  "metrics-server" = {
-    name            = "metrics-server"
-    image           = "docker.io/bitnami/metrics-server"
-    source_registry = "docker.io"
-    source_iamge    = "bitnami/metrics-server"
-    source_tag      = "0.6.2-debian-11-r9"
-    enabled         = true
-  }
-  "istio-operator" = {
-    name            = "istio/operator"
-    image           = "docker.io/istio/operator"
-    source_registry = "docker.io"
-    source_image    = "istio/operator"
-    source_tag      = "1.16.1"
-    enabled         = true
-  }
-  "istio-pilot" = {
-    name            = "istio/pilot"
-    image           = "docker.io/istio/pilot"
-    source_registry = "docker.io"
-    source_image    = "istio/pilot"
-    source_tag      = "1.16.1"
-    enabled         = true
-  }
-  "istio-proxyv2" = {
-    name            = "istio/proxyv2"
-    image           = "docker.io/istio/proxyv2"
-    source_registry = "docker.io"
-    source_image    = "istio/proxyv2"
-    source_tag      = "1.16.1"
-    enabled         = true
-  }
-  "prometheus-operator" = {
-    name            = "prometheus-operator"
-    image           = "docker.io/bitnami/prometheus-operator"
-    source_registry = "docker.io"
-    source_image    = "bitnami/prometheus-operator"
-    source_tag      = "0.50.0"
-    enabled         = true
-  }
-  "prometheus" = {
-    name            = "prometheus"
-    image           = "docker.io/bitnami/prometheus"
-    source_registry = "docker.io"
-    source_mage     = "bitnami/prometheus"
-    tag             = "2.28.1"
-    enabled         = true
-  }
-  "alertmanager" = {
-    name           = "alertmanager"
-    image          = "docker.io/bitnami/alertmanager"
-    soure_registry = "docker.io"
-    soure_image    = "bitnami/alertmanager"
-    tag            = "0.22.2"
-    enabled        = true
-  }
-}
diff --git a/examples/full-cluster-tf-upgrade/1.25/common-services/variables.images.auto.tfvars b/examples/full-cluster-tf-upgrade/1.25/common-services/variables.images.auto.tfvars
new file mode 100644
index 0000000..60f7672
--- /dev/null
+++ b/examples/full-cluster-tf-upgrade/1.25/common-services/variables.images.auto.tfvars
@@ -0,0 +1,128 @@
+chart_details = {
+  "cert-manager" = {
+    name       = "cert-manager"
+    repository = "https://charts.jetstack.io"
+    version    = "v1.12.2"
+    use_remote = true
+  }
+
+  "metrics-server" = {
+    name       = "metrics-server"
+    repository = "https://charts.bitnami.com/bitnami"
+    version    = "6.2.6"
+    use_remote = true
+  }
+}
+
+image_details = {
+  "cert-manager-controller" = {
+    name            = "cert-manager-controller"
+    image           = "quay.io/jetstack/cert-manager-controller"
+    dest_path       = null
+    source_registry = "quay.io"
+    source_image    = "jetstack/cert-manager-controller"
+    source_tag      = null
+    tag             = "v1.12.2"
+    enabled         = true
+  }
+  "cert-manager-cainjector" = {
+    name            = "cert-manager-cainjector"
+    image           = "quay.io/jetstack/cert-manager-cainjector"
+    dest_path       = null
+    source_registry = "quay.io"
+    source_image    = "jetstack/cert-manager-cainjector"
+    source_tag      = null
+    tag             = "v1.12.2"
+    enabled         = true
+  }
+  "cert-manager-webhook" = {
+    name            = "cert-manager-webhook"
+    image           = "quay.io/jetstack/cert-manager-webhook"
+    dest_path       = null
+    source_registry = "quay.io"
+    source_image    = "jetstack/cert-manager-webhook"
+    source_tag      = null
+    tag             = "v1.12.2"
+    enabled         = true
+  }
+  "cluster-autoscaler" = {
+    name            = "cluster-autoscaler"
+    image           = "registry.k8s.io/autoscaling/cluster-autoscaler"
+    dest_path       = null
+    source_registry = "registry.k8s.io"
+    source_image    = "autoscaling/cluster-autoscaler"
+    source_tag      = null
+    tag             = "v1.24.0"
+    enabled         = true
+  }
+  "metrics-server" = {
+    name            = "metrics-server"
+    image           = "docker.io/bitnami/metrics-server"
+    dest_path       = null
+    source_registry = "docker.io"
+    source_iamge    = "bitnami/metrics-server"
+    source_tag      = null
+    tag             = "0.6.2-debian-11-r9"
+    enabled         = true
+  }
+  "istio-operator" = {
+    name            = "istio/operator"
+    image           = "docker.io/istio/operator"
+    dest_path       = null
+    source_registry = "docker.io"
+    source_image    = "istio/operator"
+    source_tag      = null
+    tag             = "1.16.1"
+    enabled         = true
+  }
+  "istio-pilot" = {
+    name            = "istio/pilot"
+    image           = "docker.io/istio/pilot"
+    dest_path       = null
+    source_registry = "docker.io"
+    source_image    = "istio/pilot"
+    source_tag      = null
+    tag             = "1.16.1"
+    enabled         = true
+  }
+  "istio-proxyv2" = {
+    name            = "istio/proxyv2"
+    image           = "docker.io/istio/proxyv2"
+    dest_path       = null
+    source_registry = "docker.io"
+    source_image    = "istio/proxyv2"
+    source_tag      = null
+    tag             = "1.16.1"
+    enabled         = true
+  }
+  "prometheus-operator" = {
+    name            = "prometheus-operator"
+    image           = "docker.io/bitnami/prometheus-operator"
+    dest_path       = null
+    source_registry = "docker.io"
+    source_image    = "bitnami/prometheus-operator"
+    source_tag      = null
+    tag             = "0.50.0"
+    enabled         = true
+  }
+  "prometheus" = {
+    name            = "prometheus"
+    image           = "docker.io/bitnami/prometheus"
+    dest_path       = null
+    source_registry = "docker.io"
+    source_mage     = "bitnami/prometheus"
+    source_tag      = null
+    tag             = "2.28.1"
+    enabled         = true
+  }
+  "alertmanager" = {
+    name           = "alertmanager"
+    image          = "docker.io/bitnami/alertmanager"
+    dest_path      = null
+    soure_registry = "docker.io"
+    soure_image    = "bitnami/alertmanager"
+    source_tag     = null
+    tag            = "0.22.2"
+    enabled        = true
+  }
+}
diff --git a/examples/full-cluster-tf-upgrade/1.25/common-services/variables.images.tf b/examples/full-cluster-tf-upgrade/1.25/common-services/variables.images.tf
new file mode 100644
index 0000000..b7426ef
--- /dev/null
+++ b/examples/full-cluster-tf-upgrade/1.25/common-services/variables.images.tf
@@ -0,0 +1,26 @@
+variable "chart_details" {
+  description = "Map of object with details about remote charts"
+  type = map(object(
+    {
+      name       = string
+      repository = string
+      version    = string
+      use_remote = bool
+  }))
+  default = {}
+}
+
+variable "image_details" {
+  description = "List of image configuration objects to copy from SOURCE to DESTINATION"
+  type = map(object({
+    name            = string,
+    tag             = string,
+    dest_path       = string,
+    source_registry = string,
+    source_image    = string,
+    source_tag      = string,
+    enabled         = bool,
+  }))
+  default = {}
+}
+