diff --git a/charts/jxgh/lighthouse/values.yaml.gotmpl b/charts/jxgh/lighthouse/values.yaml.gotmpl
index dbaa854dba..80865c3b1a 100644
--- a/charts/jxgh/lighthouse/values.yaml.gotmpl
+++ b/charts/jxgh/lighthouse/values.yaml.gotmpl
@@ -12,7 +12,7 @@ git:
 
 service:
   name: hook
-  
+
 replicaCount: 2
 
 {{- if eq .Values.jxRequirements.cluster.provider "gke" }}
@@ -62,6 +62,14 @@ vault:
 hmacTokenEnabled: false
 {{- end }}
 
+{{- if hasKey .Values.jxRequirements "argocd" }}
+{{- if .Values.jxRequirements.argocd.enabled }}
+# avoid creating new secrets. bypasses 'jx secret' steps in Makefile
+hmacSecretName: lighthouse-hmac-token
+oauthSecretName: lighthouse-oauth-token
+{{- end }}
+{{- end }}
+
 {{- if hasKey .Values.jxRequirements.cluster "clusterName" }}
 clusterName: "{{ .Values.jxRequirements.cluster.clusterName }}"
 {{- end }}