diff --git a/Chart/templates/deployment.yaml b/Chart/templates/deployment.yaml
index 3038ae0..b76d8f6 100644
--- a/Chart/templates/deployment.yaml
+++ b/Chart/templates/deployment.yaml
@@ -20,7 +20,7 @@ spec:
             {{- range $sec := .Values.secrets }}
              {{- if eq $sec.type "env"}}
             - secretRef:
-                name: {{ $sec.name }} 
+                name: {{ include "..fullname" $ }}-{{ $sec.name }} 
              {{- end }}
             {{- end }}
             {{- range $esec := .Values.externalSecrets }}
@@ -32,7 +32,7 @@ spec:
             {{- range $cfgm := .Values.configMaps }}
               {{- if eq $cfgm.type "env"}}
             - configMapRef:
-                name: {{ $cfgm.name }} 
+                name: {{ include "..fullname" $ }}-{{ $cfgm.name }} 
               {{- end }}
             {{- end }}
           image: {{ .Values.site.image }}