diff --git a/awsconfigs/apps/notebook-controller/deployment_patch.yaml b/awsconfigs/apps/notebook-controller/deployment_patch.yaml
deleted file mode 100644
index 229a3a9851..0000000000
--- a/awsconfigs/apps/notebook-controller/deployment_patch.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: notebook-controller-deployment
-  namespace: kubeflow
-spec:
-  template:
-    spec:
-      containers:
-      - name: manager
-        env:
-        - name: ENABLE_CULLING
-          valueFrom:
-            configMapKeyRef:
-              key: enableCulling
-              name: config
-        - name: CULL_IDLE_TIME
-          valueFrom:
-            configMapKeyRef:
-              key: cullIdleTime
-              name: config
-        - name: IDLENESS_CHECK_PERIOD
-          valueFrom:
-            configMapKeyRef:
-              key: idlenessCheckPeriod
-              name: config
diff --git a/awsconfigs/apps/notebook-controller/kustomization.yaml b/awsconfigs/apps/notebook-controller/kustomization.yaml
index 0bf00447e3..2c56cbc8c1 100644
--- a/awsconfigs/apps/notebook-controller/kustomization.yaml
+++ b/awsconfigs/apps/notebook-controller/kustomization.yaml
@@ -3,8 +3,6 @@ kind: Kustomization
 namespace: kubeflow
 bases:
 - ../../../upstream/apps/jupyter/notebook-controller/upstream/overlays/kubeflow
-patchesStrategicMerge:
-- deployment_patch.yaml
 configMapGenerator:
 - name: config
   behavior: merge
diff --git a/awsconfigs/apps/notebook-controller/params.env b/awsconfigs/apps/notebook-controller/params.env
index cf65382d3c..8b76ecab8a 100644
--- a/awsconfigs/apps/notebook-controller/params.env
+++ b/awsconfigs/apps/notebook-controller/params.env
@@ -1,3 +1,3 @@
-enableCulling=false
-cullIdleTime=30
-idlenessCheckPeriod=5
\ No newline at end of file
+ENABLE_CULLING=false
+CULL_IDLE_TIME=30
+IDLENESS_CHECK_PERIOD=5
\ No newline at end of file
diff --git a/charts/apps/notebook-controller/Chart.yaml b/charts/apps/notebook-controller/Chart.yaml
index 7b0db7e00b..9d6b5fd6be 100644
--- a/charts/apps/notebook-controller/Chart.yaml
+++ b/charts/apps/notebook-controller/Chart.yaml
@@ -1,24 +1,6 @@
 apiVersion: v2
-name: notebook-controller
+appVersion: v1.7.0
 description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+name: notebook-controller
 type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "v1.6.1"
+version: 0.2.0
diff --git a/charts/apps/notebook-controller/templates/ConfigMap/notebook-controller-config-9675dd2fhk-kubeflow-ConfigMap.yaml b/charts/apps/notebook-controller/templates/ConfigMap/notebook-controller-config-9675dd2fhk-kubeflow-ConfigMap.yaml
deleted file mode 100644
index 3bffdb274b..0000000000
--- a/charts/apps/notebook-controller/templates/ConfigMap/notebook-controller-config-9675dd2fhk-kubeflow-ConfigMap.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-data:
-  cullIdleTime: '{{ .Values.cullingPolicy.cullIdleTime }}'
-  enableCulling: '{{ .Values.cullingPolicy.enableCulling }}'
-  idlenessCheckPeriod: '{{ .Values.cullingPolicy.idlenessCheckPeriod }}'
-  ISTIO_GATEWAY: kubeflow/kubeflow-gateway
-  USE_ISTIO: 'true'
-kind: ConfigMap
-metadata:
-  annotations: {}
-  labels:
-    app: notebook-controller
-    kustomize.component: notebook-controller
-  name: notebook-controller-config-9675dd2fhk
-  namespace: kubeflow
diff --git a/charts/apps/notebook-controller/templates/ConfigMap/notebook-controller-config-mf8876789d-kubeflow-ConfigMap.yaml b/charts/apps/notebook-controller/templates/ConfigMap/notebook-controller-config-mf8876789d-kubeflow-ConfigMap.yaml
new file mode 100644
index 0000000000..1bd0ca1fe4
--- /dev/null
+++ b/charts/apps/notebook-controller/templates/ConfigMap/notebook-controller-config-mf8876789d-kubeflow-ConfigMap.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+data:
+  CLUSTER_DOMAIN: cluster.local
+  CULL_IDLE_TIME: '{{ .Values.cullingPolicy.cullIdleTime }}'
+  ENABLE_CULLING: '{{ .Values.cullingPolicy.enableCulling }}'
+  IDLENESS_CHECK_PERIOD: '{{ .Values.cullingPolicy.idlenessCheckPeriod }}'
+  ISTIO_GATEWAY: kubeflow/kubeflow-gateway
+  USE_ISTIO: 'true'
+kind: ConfigMap
+metadata:
+  annotations: {}
+  labels:
+    app: notebook-controller
+    kustomize.component: notebook-controller
+  name: notebook-controller-config-mf8876789d
+  namespace: kubeflow
diff --git a/charts/apps/notebook-controller/templates/Deployment/notebook-controller-deployment-kubeflow-Deployment.yaml b/charts/apps/notebook-controller/templates/Deployment/notebook-controller-deployment-kubeflow-Deployment.yaml
index 1c49662941..88f835a5c2 100644
--- a/charts/apps/notebook-controller/templates/Deployment/notebook-controller-deployment-kubeflow-Deployment.yaml
+++ b/charts/apps/notebook-controller/templates/Deployment/notebook-controller-deployment-kubeflow-Deployment.yaml
@@ -21,33 +21,38 @@ spec:
       - command:
         - /manager
         env:
-        - name: ENABLE_CULLING
+        - name: USE_ISTIO
           valueFrom:
             configMapKeyRef:
-              key: enableCulling
-              name: notebook-controller-config-9675dd2fhk
-        - name: CULL_IDLE_TIME
+              key: USE_ISTIO
+              name: notebook-controller-config-mf8876789d
+        - name: ISTIO_GATEWAY
           valueFrom:
             configMapKeyRef:
-              key: cullIdleTime
-              name: notebook-controller-config-9675dd2fhk
-        - name: IDLENESS_CHECK_PERIOD
+              key: ISTIO_GATEWAY
+              name: notebook-controller-config-mf8876789d
+        - name: CLUSTER_DOMAIN
           valueFrom:
             configMapKeyRef:
-              key: idlenessCheckPeriod
-              name: notebook-controller-config-9675dd2fhk
-        - name: USE_ISTIO
+              key: CLUSTER_DOMAIN
+              name: notebook-controller-config-mf8876789d
+        - name: ENABLE_CULLING
           valueFrom:
             configMapKeyRef:
-              key: USE_ISTIO
-              name: notebook-controller-config-9675dd2fhk
-        - name: ISTIO_GATEWAY
+              key: ENABLE_CULLING
+              name: notebook-controller-config-mf8876789d
+        - name: CULL_IDLE_TIME
           valueFrom:
             configMapKeyRef:
-              key: ISTIO_GATEWAY
-              name: notebook-controller-config-9675dd2fhk
-        image: docker.io/kubeflownotebookswg/notebook-controller:v1.6.1
-        imagePullPolicy: Always
+              key: CULL_IDLE_TIME
+              name: notebook-controller-config-mf8876789d
+        - name: IDLENESS_CHECK_PERIOD
+          valueFrom:
+            configMapKeyRef:
+              key: IDLENESS_CHECK_PERIOD
+              name: notebook-controller-config-mf8876789d
+        image: docker.io/kubeflownotebookswg/notebook-controller:v1.7.0-rc.1
+        imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:
             path: /healthz
diff --git a/tools/helmify/src/config.yaml b/tools/helmify/src/config.yaml
index 07381fc881..f8f40eaa04 100644
--- a/tools/helmify/src/config.yaml
+++ b/tools/helmify/src/config.yaml
@@ -244,8 +244,8 @@ notebook-controller:
   kustomization_paths:
     - awsconfigs/apps/notebook-controller
   output_helm_chart_path: charts/apps/notebook-controller
-  version: 0.1.1
-  app_version: v1.6.1
+  version: 0.2.0
+  app_version: v1.7.0
   params:
     template_paths: 
       - tools/helmify/template/notebook-controller/params.env
diff --git a/tools/helmify/template/notebook-controller/params.env b/tools/helmify/template/notebook-controller/params.env
index b754cb4ff1..1973f72ce3 100644
--- a/tools/helmify/template/notebook-controller/params.env
+++ b/tools/helmify/template/notebook-controller/params.env
@@ -1,3 +1,3 @@
-enableCulling={{ .Values.cullingPolicy.enableCulling }}
-cullIdleTime={{ .Values.cullingPolicy.cullIdleTime }}
-idlenessCheckPeriod={{ .Values.cullingPolicy.idlenessCheckPeriod }}
+ENABLE_CULLING={{ .Values.cullingPolicy.enableCulling }}
+CULL_IDLE_TIME={{ .Values.cullingPolicy.cullIdleTime }}
+IDLENESS_CHECK_PERIOD={{ .Values.cullingPolicy.idlenessCheckPeriod }}