diff --git a/.github/workflows/lint_test.yaml b/.github/workflows/lint_test.yaml
index 1ca99744..ecdc9fb7 100644
--- a/.github/workflows/lint_test.yaml
+++ b/.github/workflows/lint_test.yaml
@@ -33,8 +33,22 @@ jobs:
           fi
 
       - name: Run chart-testing (lint)
+        if: steps.list-changed.outputs.changed == 'true'
         run: ct lint --config .github/ct.yaml
 
+      - name: Create kind cluster
+        uses: helm/kind-action@v1.4.0
+        if: steps.list-changed.outputs.changed == 'true'
+
+      - name: Run chart-testing gen3 (install)
+        if: steps.list-changed.outputs.changed == 'true'
+        run: ct install --config .github/ct.yaml --charts helm/gen3
+
+      # - name: Run chart-testing gen3 (upgrade)
+      #   if: steps.list-changed.outputs.changed == 'true'
+      #   run: ct install --upgrade --debug --chart-dirs helm --charts helm/gen3
+
+    
   # deploy-charts-to-kind:
   #   name: ${{ matrix.environments }} - gen3 data portal build
   #   timeout-minutes: 20
@@ -42,9 +56,3 @@ jobs:
   #   needs: [get-changes-for-envs]
   #   if: ${{ needs.get-changes-for-envs.outputs.matrix != '[]' && needs.get-changes-for-envs.outputs.matrix != '' }}
   #   steps:
-  #     - name: Create kind cluster
-  #       uses: helm/kind-action@v1.4.0
-  #       if: steps.list-changed.outputs.changed == 'true'
-
-  #     - name: Run chart-testing (install)
-  #       run: ct install
diff --git a/helm/ambassador/templates/serviceaccount.yaml b/helm/ambassador/templates/serviceaccount.yaml
index d1ae1a61..3325f520 100644
--- a/helm/ambassador/templates/serviceaccount.yaml
+++ b/helm/ambassador/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ include "ambassador.fullname" . }}
+  name: ambassador-{{ .Release.Namespace }}
 rules:
 - apiGroups: [""]
   resources:
@@ -25,7 +25,7 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ include "ambassador.fullname" . }}
+  name: ambassador-{{ .Release.Namespace }}
 subjects:
 - kind: ServiceAccount
   name: ambassador
diff --git a/helm/common/templates/_postgres_secrets.tpl b/helm/common/templates/_postgres_secrets.tpl
index c256b10f..15c3c6a2 100644
--- a/helm/common/templates/_postgres_secrets.tpl
+++ b/helm/common/templates/_postgres_secrets.tpl
@@ -56,7 +56,7 @@ Usage:
   {{- $chartName := .context.Chart.Name }}
   
   {{- $valuesPostgres := get .context.Values.global.postgres.master .key}}
-  {{- $secret :=  (lookup "v1" "Secret" "default" "gen3-postgresql" )}}
+  {{- $secret :=  (lookup "v1" "Secret" "default" "{{ .Release.Name }}-postgresql" )}}
   {{- $devPostgresSecret := "" }}
   {{-  if $secret }}
     {{- $devPostgresSecret = (index $secret "data" "postgres-password") | b64dec }}
diff --git a/helm/gen3/README.md b/helm/gen3/README.md
index c190cdf6..3fce33cd 100644
--- a/helm/gen3/README.md
+++ b/helm/gen3/README.md
@@ -60,7 +60,7 @@ Helm chart to deploy Gen3 Data Commons
 | db_restore | bool | `false` |  |
 | fence.enabled | bool | `true` |  |
 | fence.image.repository | string | `nil` |  |
-| fence.image.tag | string | `nil` |  |
+| fence.image.tag | string | `"feat_dbenvvar"` |  |
 | global.aws.account | string | `nil` |  |
 | global.aws.enabled | bool | `false` |  |
 | global.dbRestoreBucket | string | `"gen3-dummy-data"` |  |
@@ -84,7 +84,7 @@ Helm chart to deploy Gen3 Data Commons
 | global.syncFromDbgap | bool | `false` |  |
 | global.tierAccessLevel | string | `"libre"` |  |
 | global.userYamlS3Path | string | `"s3://cdis-gen3-users/test/user.yaml"` |  |
-| guppy.enabled | bool | `true` |  |
+| guppy.enabled | bool | `false` |  |
 | guppy.image.repository | string | `nil` |  |
 | guppy.image.tag | string | `nil` |  |
 | hatchery.enabled | bool | `true` |  |
diff --git a/helm/gen3/values.yaml b/helm/gen3/values.yaml
index b5d32a12..ab834c99 100644
--- a/helm/gen3/values.yaml
+++ b/helm/gen3/values.yaml
@@ -58,10 +58,10 @@ fence:
   enabled: true
   image:
     repository:
-    tag:
+    tag: feat_dbenvvar
 
 guppy:
-  enabled: true
+  enabled: false
   image:
     repository:
     tag:
diff --git a/helm/revproxy/templates/_helpers.tpl b/helm/revproxy/templates/_helpers.tpl
index 2019b5ad..da8beb75 100644
--- a/helm/revproxy/templates/_helpers.tpl
+++ b/helm/revproxy/templates/_helpers.tpl
@@ -48,7 +48,6 @@ Selector labels
 app.kubernetes.io/name: {{ include "revproxy.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app: revproxy
-#GEN3_DATE_LABEL
 {{- end }}
 
 {{/*
diff --git a/helm/wts/templates/rolebinding.yaml b/helm/wts/templates/rolebinding.yaml
index b949bbe4..613a7a7b 100644
--- a/helm/wts/templates/rolebinding.yaml
+++ b/helm/wts/templates/rolebinding.yaml
@@ -1,8 +1,7 @@
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  #WTS_BINDING
-  name: wts-role-binding
+  name: wts-role-binding-{{ .Release.Namespace}}
   namespace: {{ $.Release.Namespace }}
 subjects:
 - kind: ServiceAccount