diff --git a/bin/add-roles.sh b/bin/add-roles.sh
index 2b7e1e8..8c95656 100755
--- a/bin/add-roles.sh
+++ b/bin/add-roles.sh
@@ -35,6 +35,7 @@
 ./bin/utils/ccd-add-role.sh "hearing-centre-admin"
 ./bin/utils/ccd-add-role.sh "national-business-centre"
 ./bin/utils/ccd-add-role.sh "hearing-centre-team-leader"
+./bin/utils/ccd-add-role.sh "next-hearing-date-admin"
 
 roles=("solicitor" "systemupdate" "admin" "staff" "judge")
 for role in "${roles[@]}"
diff --git a/charts/civil-orchestrator-service/values.aat.template.yaml b/charts/civil-orchestrator-service/values.aat.template.yaml
index ddf462a..774751e 100644
--- a/charts/civil-orchestrator-service/values.aat.template.yaml
+++ b/charts/civil-orchestrator-service/values.aat.template.yaml
@@ -62,8 +62,6 @@ civil-service:
             alias: azure.application-insights.instrumentation-key
           - name: docmosis-api-key
             alias: docmosis.tornado.key
-          - name: cmc-db-password-v11
-            alias: CMC_DB_PASSWORD
           - name: gov-notify-api-key
             alias: GOV_NOTIFY_API_KEY
           - name: sendgrid-api-key
diff --git a/charts/civil-orchestrator-service/values.preview.template.yaml b/charts/civil-orchestrator-service/values.preview.template.yaml
index 7517692..f8e3b80 100644
--- a/charts/civil-orchestrator-service/values.preview.template.yaml
+++ b/charts/civil-orchestrator-service/values.preview.template.yaml
@@ -61,8 +61,6 @@ civil-service:
             alias: azure.application-insights.instrumentation-key
           - name: docmosis-api-key
             alias: docmosis.tornado.key
-          - name: cmc-db-password-v11
-            alias: CMC_DB_PASSWORD
           - name: gov-notify-api-key
             alias: GOV_NOTIFY_API_KEY
           - name: sendgrid-api-key