diff --git a/.gitignore b/.gitignore
index 0658efdb..c3606772 100755
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,8 @@
 
 # Ignore changes to sample environments
 helmfile/environments/dev/values.yaml
+helmfile/environments/dev/values.gotmpl
+helmfile/environments/test/values.yaml
+helmfile/environments/test/values.gotmpl
 helmfile/environments/prod/values.yaml
+helmfile/environments/prod/values.gotmpl
diff --git a/helmfile.yaml b/helmfile.yaml
index 116d7064..e94cbb12 100644
--- a/helmfile.yaml
+++ b/helmfile.yaml
@@ -29,6 +29,7 @@ missingFileHandler: "Error"
 # - Installing a single release from root via helmfile apply -f helmfile/apps/<app>/helmfile.yaml
 # - Installing a single release from app directory via helmfile apply
 # Issue: https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/-/issues/2
+
 environments:
   default:
     values:
@@ -39,9 +40,17 @@ environments:
       - "helmfile/environments/default/*.gotmpl"
       - "helmfile/environments/default/*.yaml"
       - "helmfile/environments/dev/values.yaml"
+      - "helmfile/environments/dev/values.gotmpl"
+  test:
+    values:
+      - "helmfile/environments/default/*.gotmpl"
+      - "helmfile/environments/default/*.yaml"
+      - "helmfile/environments/test/values.yaml"
+      - "helmfile/environments/test/values.gotmpl"
   prod:
     values:
       - "helmfile/environments/default/*.gotmpl"
       - "helmfile/environments/default/*.yaml"
       - "helmfile/environments/prod/values.yaml"
+      - "helmfile/environments/prod/values.gotmpl"
 ...
diff --git a/helmfile/bases/environments.yaml b/helmfile/bases/environments.yaml
index e3b20b37..2aedf1fa 100644
--- a/helmfile/bases/environments.yaml
+++ b/helmfile/bases/environments.yaml
@@ -11,9 +11,17 @@ environments:
       - "../../environments/default/*.gotmpl"
       - "../../environments/default/*.yaml"
       - "../../environments/dev/values.yaml"
+      - "../../environments/dev/values.gotmpl"
+  test:
+    values:
+      - "../../environments/default/*.gotmpl"
+      - "../../environments/default/*.yaml"
+      - "../../environments/test/values.yaml"
+      - "../../environments/test/values.gotmpl"
   prod:
     values:
       - "../../environments/default/*.gotmpl"
       - "../../environments/default/*.yaml"
       - "../../environments/prod/values.yaml"
+      - "../../environments/prod/values.gotmpl"
 ...
diff --git a/helmfile/environments/default/images.yaml b/helmfile/environments/default/images.yaml
index ce9e4401..a0233152 100644
--- a/helmfile/environments/default/images.yaml
+++ b/helmfile/environments/default/images.yaml
@@ -171,55 +171,55 @@ images:
     # @supplier: "Univention"
   umsConfigHtpasswd:
     repository: "souvap/tooling/images/univention/config-htpasswd"
-    tag: "latest@sha256:24c5e218baa62b169e7222d8ee4d3951ddc8622cd359def6b660bb23a1052f9e"
+    tag: "latest"
     # @supplier: "Univention"
   umsDataLoader:
     repository: "souvap/tooling/images/univention/data-loader"
-    tag: "latest@sha256:857837c1810f82362d441544dc32bd2c1d6fe358bbb5ae0e2c60b7f8f4092190"
+    tag: "latest"
     # @supplier: "Univention"
   umsLdapNotifier:
     repository: "souvap/tooling/images/univention/ldap-notifier"
-    tag: "latest@sha256:6eccf86fe78926247ec9b59d7ba83c53271bc3ca7d0195863c0489e22c836002"
+    tag: "latest"
     # @supplier: "Univention"
   umsLdapServer:
     repository: "souvap/tooling/images/univention/ldap-server"
-    tag: "latest@sha256:4a7c44b37c727cdc03e4043c88e3dbf6b1f119772c5c1904eaed3298bdd49a3d"
+    tag: "latest"
     # @supplier: "Univention"
   umsNotificationsApi:
     repository: "souvap/tooling/images/univention/notifications-api"
-    tag: "latest@sha256:87a047c2d0669fcbb3501ef94192812e17e09aecabc1edd2e4b92afbb7ea4b20"
+    tag: "latest"
     # @supplier: "Univention"
   umsPortalListener:
     repository: "souvap/tooling/images/univention/portal-listener"
-    tag: "latest@sha256:bcf48d108bc2f1afd745659a1d4f11f1dd0d8ada034899aa401dfea32a29c87a"
+    tag: "latest"
     # @supplier: "Univention"
   umsPortalFrontend:
     repository: "souvap/tooling/images/univention/portal-frontend"
-    tag: "latest@sha256:a1b11db009e992d91cfef2bc60a5022cd4498c38908194020c881ef6dd325bae"
+    tag: "latest"
     # @supplier: "Univention"
   umsPortalServer:
     repository: "souvap/tooling/images/univention/portal-server"
-    tag: "latest@sha256:eb0b032c4cf4b207f78b80c69f3e593e01e577779d877e16908902f19b4fc2ee"
+    tag: "latest"
     # @supplier: "Univention"
   umsWaitForDependency:
     repository: "souvap/tooling/images/univention/wait-for-dependency"
-    tag: "latest@sha256:5d8d5e9ed55af2d12fef25856e5e61c7d13081458e4b14e6a01b10488b8067d3"
+    tag: "latest"
     # @supplier: "Univention"
   umsStoreDav:
     repository: "souvap/tooling/images/univention/store-dav"
-    tag: "latest@sha256:d65f705e46a497ba58e7373f19973835f731796baeace16a32d6331469bf0068"
+    tag: "latest"
     # @supplier: "Univention"
   umsUdmRestApi:
     repository: "souvap/tooling/images/univention/udm-rest-api"
-    tag: "latest@sha256:dce4322646749692c5d4692ccd7ff55df080a4af3485585a50c82871715e0cae"
+    tag: "latest"
     # @supplier: "Univention"
   umsUmcGateway:
     repository: "souvap/tooling/images/univention/umc-gateway"
-    tag: "latest@sha256:18172ee4317a9259291f251c0cc1d2be05e003558cbd18d6dc062098a127cc8d"
+    tag: "latest"
     # @supplier: "Univention"
   umsUmcServer:
     repository: "souvap/tooling/images/univention/umc-server"
-    tag: "latest@sha256:6cbb1708109c5a0c13f3ee433989094d04cecfb8b32975e723d0f5a2e526f8db"
+    tag: "latest"
     # @supplier: "Univention"
   wellKnown:
     repository: "library/nginx"
diff --git a/helmfile/environments/dev/values.gotmpl.sample b/helmfile/environments/dev/values.gotmpl.sample
new file mode 100644
index 00000000..a00a8059
--- /dev/null
+++ b/helmfile/environments/dev/values.gotmpl.sample
@@ -0,0 +1,8 @@
+{{/*
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
+---
+sampleWithTemplating: {{ env "YOUR_ENV_VARIABLE_FOR_TEMPLATING" | quote }}
+
+...
diff --git a/helmfile/environments/prod/values.gotmpl.sample b/helmfile/environments/prod/values.gotmpl.sample
new file mode 100644
index 00000000..a00a8059
--- /dev/null
+++ b/helmfile/environments/prod/values.gotmpl.sample
@@ -0,0 +1,8 @@
+{{/*
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
+---
+sampleWithTemplating: {{ env "YOUR_ENV_VARIABLE_FOR_TEMPLATING" | quote }}
+
+...
diff --git a/helmfile/environments/test/values.gotmpl.sample b/helmfile/environments/test/values.gotmpl.sample
new file mode 100644
index 00000000..a00a8059
--- /dev/null
+++ b/helmfile/environments/test/values.gotmpl.sample
@@ -0,0 +1,8 @@
+{{/*
+SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+SPDX-License-Identifier: Apache-2.0
+*/}}
+---
+sampleWithTemplating: {{ env "YOUR_ENV_VARIABLE_FOR_TEMPLATING" | quote }}
+
+...
diff --git a/helmfile/environments/test/values.yaml.sample b/helmfile/environments/test/values.yaml.sample
new file mode 100644
index 00000000..c1a20286
--- /dev/null
+++ b/helmfile/environments/test/values.yaml.sample
@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+# SPDX-License-Identifier: Apache-2.0
+---
+# This a sample file and could be filled with proper variable overload.
+sample: true
+...