diff --git a/templates/deployment.yaml b/templates/deployment.yaml
index e12a3557a975d138f17fdf62c842514d6c5d1fee..a86059e656cd5c4452a6383ef1f023b99b9d765c 100644
--- a/templates/deployment.yaml
+++ b/templates/deployment.yaml
@@ -46,9 +46,9 @@ spec:
             {{- toYaml .Values.resources | nindent 12 }}
         envFrom:
         - configMapRef:
-            name: {{ .Release.Name }}-config
+            name: {{ template "greenlight.fullname" . }}-config
         - secretRef:
-            name: {{ .Release.Name }}-secret
+            name: {{ template "greenlight.fullname" . }}-secret
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}