diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
index ec191ca14e727b792ec06aa35ad9f585a823ba80..f9e79d581cd124289a7498508cfc901312f4662b 100644
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/*
 Create chart imageArch suffix.
 */}}
-{{- define "beagle.imageArch" -}}
+{{- define ".beagle.imageArch" -}}
 {{- if not (eq "amd64" .Values.global.imageArch) -}}
 {{- print "-" .Values.global.imageArch -}}
 {{- else -}}
diff --git a/templates/chartmuseum/chartmuseum-dpl.yaml b/templates/chartmuseum/chartmuseum-dpl.yaml
index d9420ae3b3e63fed1a3407beae0d64c32bc1377f..4c9aeb390f2f5b6731b4efd33cbecb705dec963d 100644
--- a/templates/chartmuseum/chartmuseum-dpl.yaml
+++ b/templates/chartmuseum/chartmuseum-dpl.yaml
@@ -49,7 +49,7 @@ spec:
 {{- if contains "/" .Values.chartmuseum.image.repository }}
         image: "{{ .Values.chartmuseum.image.repository }}"
 {{- else }}
-        image: "{{ .Values.chartmuseum.image.hub | default .Values.global.hub }}/{{ .Values.chartmuseum.image.repository }}:{{ .Values.chartmuseum.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}"
+        image: "{{ .Values.chartmuseum.image.hub | default .Values.global.hub }}/{{ .Values.chartmuseum.image.repository }}:{{ .Values.chartmuseum.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}"
 {{- end }}
         imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}"
         livenessProbe:
diff --git a/templates/clair/clair-dpl.yaml b/templates/clair/clair-dpl.yaml
index 384d7ee41d4ebe09678d1b7dc44dcb051c07f5a1..039db0d768022ad8c764b6de9d21aa389a8d7697 100644
--- a/templates/clair/clair-dpl.yaml
+++ b/templates/clair/clair-dpl.yaml
@@ -42,7 +42,7 @@ spec:
 {{- if contains "/" .Values.clair.clair.image.repository }}
         image: "{{ .Values.clair.clair.image.repository }}"
 {{- else }}
-        image: "{{ .Values.clair.clair.image.hub | default .Values.global.hub }}/{{ .Values.clair.clair.image.repository }}:{{ .Values.clair.clair.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}"
+        image: "{{ .Values.clair.clair.image.hub | default .Values.global.hub }}/{{ .Values.clair.clair.image.repository }}:{{ .Values.clair.clair.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}"
 {{- end }}
         imagePullPolicy: "{{ .Values.global.imagePullPolicy }}"
         livenessProbe:
@@ -88,7 +88,7 @@ spec:
 {{- if contains "/" .Values.clair.adapter.image.repository }}
         image: "{{ .Values.clair.adapter.image.repository }}"
 {{- else }}
-        image: "{{ .Values.clair.adapter.image.hub | default .Values.global.hub }}/{{ .Values.clair.adapter.image.repository }}:{{ .Values.clair.adapter.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}"
+        image: "{{ .Values.clair.adapter.image.hub | default .Values.global.hub }}/{{ .Values.clair.adapter.image.repository }}:{{ .Values.clair.adapter.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}"
 {{- end }}
         imagePullPolicy: "{{ .Values.global.imagePullPolicy }}"
         livenessProbe:
diff --git a/templates/core/core-dpl.yaml b/templates/core/core-dpl.yaml
index 21eb12091636025b541d387184ee26488ae84832..72c37786b49da7df941c44f3038bd070abe82226 100644
--- a/templates/core/core-dpl.yaml
+++ b/templates/core/core-dpl.yaml
@@ -43,7 +43,7 @@ spec:
 {{- if contains "/" .Values.core.image.repository }}
         image: "{{ .Values.core.image.repository }}"
 {{- else }}
-        image: "{{ .Values.core.image.hub | default .Values.global.hub }}/{{ .Values.core.image.repository }}:{{ .Values.core.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}"
+        image: "{{ .Values.core.image.hub | default .Values.global.hub }}/{{ .Values.core.image.repository }}:{{ .Values.core.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}"
 {{- end }}
         imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}"
         {{- if .Values.core.startupProbe.enabled }}
diff --git a/templates/database/database-ss.yaml b/templates/database/database-ss.yaml
index 8811da11f2e45cab132ff412bd08e6dd95e4f3de..df292581a34a60c76aa4b137ca7e3f35499fbbbf 100644
--- a/templates/database/database-ss.yaml
+++ b/templates/database/database-ss.yaml
@@ -39,7 +39,7 @@ spec:
 {{- if contains "/" .Values.database.internal.image.repository }}
         image: "{{ .Values.database.internal.image.repository }}"
 {{- else }}
-        image: "{{ .Values.database.internal.image.hub | default .Values.global.hub }}/{{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}"
+        image: "{{ .Values.database.internal.image.hub | default .Values.global.hub }}/{{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}"
 {{- end }}
         imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}"
         command: ["/bin/sh"]
@@ -52,7 +52,7 @@ spec:
 {{- if contains "/" .Values.database.internal.image.repository }}
         image: "{{ .Values.database.internal.image.repository }}"
 {{- else }}
-        image: "{{ .Values.database.internal.image.hub | default .Values.global.hub }}/{{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}"
+        image: "{{ .Values.database.internal.image.hub | default .Values.global.hub }}/{{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}"
 {{- end }}
         imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}"
         command: ["rm", "-Rf", "/var/lib/postgresql/data/lost+found"]
@@ -65,7 +65,7 @@ spec:
 {{- if contains "/" .Values.database.internal.image.repository }}
         image: "{{ .Values.database.internal.image.repository }}"
 {{- else }}
-        image: "{{ .Values.database.internal.image.hub | default .Values.global.hub }}/{{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}"
+        image: "{{ .Values.database.internal.image.hub | default .Values.global.hub }}/{{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}"
 {{- end }}
         imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}"
         livenessProbe:
diff --git a/templates/jobservice/jobservice-dpl.yaml b/templates/jobservice/jobservice-dpl.yaml
index b940b9e414812c8296a68c73a526d8833b88dc02..ba62cbab8c8751f410fef6adddce5e4da5b58e43 100644
--- a/templates/jobservice/jobservice-dpl.yaml
+++ b/templates/jobservice/jobservice-dpl.yaml
@@ -49,7 +49,7 @@ spec:
 {{- if contains "/" .Values.jobservice.image.repository }}
         image: "{{ .Values.jobservice.image.repository }}"
 {{- else }}
-        image: "{{ .Values.jobservice.image.hub | default .Values.global.hub }}/{{ .Values.jobservice.image.repository }}:{{ .Values.jobservice.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}"
+        image: "{{ .Values.jobservice.image.hub | default .Values.global.hub }}/{{ .Values.jobservice.image.repository }}:{{ .Values.jobservice.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}"
 {{- end }}
         imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}"
         livenessProbe:
diff --git a/templates/nginx/deployment.yaml b/templates/nginx/deployment.yaml
index a5530e4f39448a0cb3898105d11546dcb3dd6062..337c4473381bf7acd888ec9e7ac86f42ed8df31e 100644
--- a/templates/nginx/deployment.yaml
+++ b/templates/nginx/deployment.yaml
@@ -44,7 +44,7 @@ spec:
 {{- if contains "/" .Values.nginx.image.repository }}
         image: "{{ .Values.nginx.image.repository }}"
 {{- else }}
-        image: "{{ .Values.nginx.image.hub | default .Values.global.hub }}/{{ .Values.nginx.image.repository }}:{{ .Values.nginx.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}"
+        image: "{{ .Values.nginx.image.hub | default .Values.global.hub }}/{{ .Values.nginx.image.repository }}:{{ .Values.nginx.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}"
 {{- end }}
         imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}"
         {{- $_ := set . "scheme" "HTTP" -}}
diff --git a/templates/notary/notary-server.yaml b/templates/notary/notary-server.yaml
index dc942b7e51144ed7e0758ddbce5717e1561bf855..306f3658ec41251765809a992bcac9ed6de9cf9b 100644
--- a/templates/notary/notary-server.yaml
+++ b/templates/notary/notary-server.yaml
@@ -38,7 +38,7 @@ spec:
 {{- if contains "/" .Values.notary.server.image.repository }}
         image: "{{ .Values.notary.server.image.repository }}"
 {{- else }}
-        image: "{{ .Values.notary.server.image.hub | default .Values.global.hub }}/{{ .Values.notary.server.image.repository }}:{{ .Values.notary.server.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}"
+        image: "{{ .Values.notary.server.image.hub | default .Values.global.hub }}/{{ .Values.notary.server.image.repository }}:{{ .Values.notary.server.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}"
 {{- end }}
         imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}"
 {{- if .Values.notary.server.resources }}
diff --git a/templates/notary/notary-signer.yaml b/templates/notary/notary-signer.yaml
index f067725ef84fdb3fc65d16ca690e8fc0946b3517..b7b955f9e4d4aaa3e7f322a02ac0333beddb5a2e 100644
--- a/templates/notary/notary-signer.yaml
+++ b/templates/notary/notary-signer.yaml
@@ -34,7 +34,7 @@ spec:
 {{- if contains "/" .Values.notary.signer.image.repository }}
         image: "{{ .Values.notary.signer.image.repository }}"
 {{- else }}
-        image: "{{ .Values.notary.signer.image.hub | default .Values.global.hub }}/{{ .Values.notary.signer.image.repository }}:{{ .Values.notary.signer.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}"
+        image: "{{ .Values.notary.signer.image.hub | default .Values.global.hub }}/{{ .Values.notary.signer.image.repository }}:{{ .Values.notary.signer.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}"
 {{- end }}
         imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}"
 {{- if .Values.notary.signer.resources }}
diff --git a/templates/portal/deployment.yaml b/templates/portal/deployment.yaml
index 2b34b4392f13e1b9eb83f26157ee2ab6f6d805d5..887fcf8dfe0e4fe8d41ee3347b579cf16fca2dbc 100644
--- a/templates/portal/deployment.yaml
+++ b/templates/portal/deployment.yaml
@@ -38,7 +38,7 @@ spec:
 {{- if contains "/" .Values.portal.image.repository }}
         image: "{{ .Values.portal.image.repository }}"
 {{- else }}
-        image: "{{ .Values.portal.image.hub | default .Values.global.hub }}/{{ .Values.portal.image.repository }}:{{ .Values.portal.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}"
+        image: "{{ .Values.portal.image.hub | default .Values.global.hub }}/{{ .Values.portal.image.repository }}:{{ .Values.portal.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}"
 {{- end }}
         imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}"
 {{- if .Values.portal.resources }}
diff --git a/templates/redis/statefulset.yaml b/templates/redis/statefulset.yaml
index 464c718fdc36b62f04193600b23091d8358b8147..93585d746b2b49125cf85486e2c1cc38bc3dbc94 100644
--- a/templates/redis/statefulset.yaml
+++ b/templates/redis/statefulset.yaml
@@ -38,7 +38,7 @@ spec:
 {{- if contains "/" .Values.redis.internal.image.repository }}
         image: "{{ .Values.redis.internal.image.repository }}"
 {{- else }}
-        image: "{{ .Values.redis.internal.image.hub | default .Values.global.hub }}/{{ .Values.redis.internal.image.repository }}:{{ .Values.redis.internal.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}"
+        image: "{{ .Values.redis.internal.image.hub | default .Values.global.hub }}/{{ .Values.redis.internal.image.repository }}:{{ .Values.redis.internal.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}"
 {{- end }}
         imagePullPolicy: "{{ .Values.global.imagePullPolicy }}"
         livenessProbe:
diff --git a/templates/registry/registry-dpl.yaml b/templates/registry/registry-dpl.yaml
index c7118486da77222275d4a314838fd35597eca510..dedacdc6f2afcae7b87cf53c4974d1e611ef80a9 100644
--- a/templates/registry/registry-dpl.yaml
+++ b/templates/registry/registry-dpl.yaml
@@ -49,7 +49,7 @@ spec:
 {{- if contains "/" .Values.registry.registry.image.repository }}
         image: "{{ .Values.registry.registry.image.repository }}"
 {{- else }}
-        image: "{{ .Values.registry.registry.image.hub | default .Values.global.hub }}/{{ .Values.registry.registry.image.repository }}:{{ .Values.registry.registry.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}"
+        image: "{{ .Values.registry.registry.image.hub | default .Values.global.hub }}/{{ .Values.registry.registry.image.repository }}:{{ .Values.registry.registry.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}"
 {{- end }}
         imagePullPolicy: "{{ .Values.global.imagePullPolicy }}"
         livenessProbe:
@@ -137,7 +137,7 @@ spec:
 {{- if contains "/" .Values.registry.controller.image.repository }}
         image: "{{ .Values.registry.controller.image.repository }}"
 {{- else }}
-        image: "{{ .Values.registry.controller.image.hub | default .Values.global.hub }}/{{ .Values.registry.controller.image.repository }}:{{ .Values.registry.controller.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}"
+        image: "{{ .Values.registry.controller.image.hub | default .Values.global.hub }}/{{ .Values.registry.controller.image.repository }}:{{ .Values.registry.controller.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}"
 {{- end }}
         imagePullPolicy: "{{ .Values.global.imagePullPolicy }}"
         livenessProbe:
diff --git a/templates/trivy/trivy-sts.yaml b/templates/trivy/trivy-sts.yaml
index 2b253a81ca02a41918bbd3cb0db22a6083e11b7a..ae0e0b59fabb020ebd53616639935e3931ac6b6c 100644
--- a/templates/trivy/trivy-sts.yaml
+++ b/templates/trivy/trivy-sts.yaml
@@ -47,7 +47,7 @@ spec:
 {{- if contains "/" .Values.trivy.image.repository }}
           image: "{{ .Values.trivy.image.repository }}"
 {{- else }}
-          image: "{{ .Values.trivy.image.hub | default .Values.global.hub }}/{{ .Values.trivy.image.repository }}:{{ .Values.trivy.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}"
+          image: "{{ .Values.trivy.image.hub | default .Values.global.hub }}/{{ .Values.trivy.image.repository }}:{{ .Values.trivy.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}"
 {{- end }}
           imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}"
           securityContext: