diff --git a/charts/jxgh/lighthouse/values.yaml.gotmpl b/charts/jxgh/lighthouse/values.yaml.gotmpl
index dbaa854db..794cf7955 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,12 @@ vault:
 hmacTokenEnabled: false
 {{- end }}
 
+{{- if and (hasKey .Values.jxRequirements.cluster "argocd") (.Values.jxRequirements.cluster.argocd.enabled) }}
+# avoid creating new secrets. bypasses 'jx secret' steps in Makefile
+hmacSecretName: lighthouse-hmac-token
+oauthSecretName: lighthouse-oauth-token
+{{- end }}
+
 {{- if hasKey .Values.jxRequirements.cluster "clusterName" }}
 clusterName: "{{ .Values.jxRequirements.cluster.clusterName }}"
 {{- end }}