diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d4c03c7eaf2a87993f584b77396b416de5ceaf0..8ab6bb2500323882ad35a60ac75a5207b67298ba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,8 @@ variables:
   OSDU_GCP_HELM_DEPLOYMENT_DIR: "devops/gcp/deploy"
   OSDU_GCP_HELM_CONFIG_DIR: "devops/gcp/configmap"
   OSDU_GCP_HELM_NAMESPACE: "default"
-  OSDU_GCP_HELM_CONFIG_SERVICE_VARS: " --set data.log_level=$OSDU_GCP_LOG_LEVEL --set data.app_project=$OSDU_GCP_PROJECT --set data.app_googleaudience=$GOOGLE_AUDIENCE --set data.google_audiences=$GOOGLE_AUDIENCE --set data.app_register=$OSDU_GCP_REGISTER_API"
-  OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: " --set data.log_level=$OSDU_GCP_LOG_LEVEL --set data.app_project=$OSDU_GCP_PROJECT --set data.app_googleaudience=$GOOGLE_AUDIENCE --set data.google_audiences=$GOOGLE_AUDIENCE --set data.app_register=$OSDU_GCP_REGISTER_API"
+  OSDU_GCP_HELM_CONFIG_SERVICE_VARS: " --set data.log_level=$OSDU_GCP_LOG_LEVEL --set data.google_audiences=$GOOGLE_AUDIENCE --set data.app_register=$OSDU_GCP_REGISTER_API"
+  OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: " --set data.log_level=$OSDU_GCP_LOG_LEVEL --set data.google_audiences=$GOOGLE_AUDIENCE --set data.app_register=$OSDU_GCP_REGISTER_API"
   OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=$OSDU_GCP_SERVICE-k8s"
   OSDU_GCP_HELM_CONFIG_SERVICE: "notification-config"
   OSDU_GCP_HELM_DEPLOYMENT_SERVICE: "notification-deploy"
diff --git a/devops/gcp/configmap/templates/notification-configmap.yaml b/devops/gcp/configmap/templates/notification-configmap.yaml
index 8b7b6e5f1643a5d5ff3ba2bfb1d6639a0e0e4e95..c3c1cbbf874a068170cfaf180253dadb25107764 100644
--- a/devops/gcp/configmap/templates/notification-configmap.yaml
+++ b/devops/gcp/configmap/templates/notification-configmap.yaml
@@ -7,9 +7,10 @@ metadata:
   namespace: "{{ .Release.Namespace }}"
 data:
   LOG_LEVEL: "{{ .Values.data.log_level }}"
-  APP_PROJECT: "{{ .Values.data.app_project }}"
+  SPRING_PROFILES_ACTIVE: "{{ .Values.data.spring_profiles_active }}"
   APP_ENTITLEMENTS: "{{ .Values.data.app_entitlements }}"
   APP_REGISTER: "{{ .Values.data.app_register }}"
   PARTITION_API: "{{ .Values.data.partition_api }}"
+  {{- if not .Values.conf.on_prem_enabled }}
   GOOGLE_AUDIENCES: "{{ .Values.data.google_audiences }}"
-  SPRING_PROFILES_ACTIVE: "{{ .Values.data.spring_profiles_active }}"
+  {{- end }}
diff --git a/devops/gcp/configmap/values.yaml b/devops/gcp/configmap/values.yaml
index 078fa99c15341d1988c7e5177858793623c86744..2316222a005ab8518dfe256132db69cc3d33da5b 100644
--- a/devops/gcp/configmap/values.yaml
+++ b/devops/gcp/configmap/values.yaml
@@ -1,11 +1,13 @@
 data:
+  # common
   log_level: "INFO"
-  app_project: ""
+  spring_profiles_active: "gcp"
   app_entitlements: "http://entitlements/api/entitlements/v2/"
   app_register: "http://register/api/register/v1"
   partition_api: "http://partition/api/partition/v1/"
+  # gcp
   google_audiences: ""
-  spring_profiles_active: "gcp"
 conf:
   configmap: "notification-config"
   app_name: "notification"
+  on_prem_enabled: false
diff --git a/devops/gcp/deploy/templates/deployment.yaml b/devops/gcp/deploy/templates/deployment.yaml
index 7fec0eb265b287ff91be5a5c6250928dcd4b63c8..11d6d40c111ed104a5f638a932fc5442d5dcaa01 100644
--- a/devops/gcp/deploy/templates/deployment.yaml
+++ b/devops/gcp/deploy/templates/deployment.yaml
@@ -24,6 +24,12 @@ spec:
           envFrom:
           - configMapRef:
               name: "{{ .Values.conf.configmap }}"
+          {{- if .Values.conf.on_prem_enabled }}
+          - secretRef:
+              name: "{{ .Values.conf.rabbitmq_secret_name }}"
+          - secretRef:
+              name: "{{ .Values.conf.openid_secret_name }}"
+          {{- end }}
           securityContext:
             allowPrivilegeEscalation: false
             runAsUser: 0
diff --git a/devops/gcp/deploy/templates/service-account.yaml b/devops/gcp/deploy/templates/service-account.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..61f46c8a5eab3b2e30ef8799b739cd9189561ca6
--- /dev/null
+++ b/devops/gcp/deploy/templates/service-account.yaml
@@ -0,0 +1,7 @@
+{{- if .Values.conf.on_prem_enabled }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: "{{ .Values.data.serviceAccountName }}"
+  namespace: "{{ .Release.Namespace }}"
+{{- end }}
diff --git a/devops/gcp/deploy/templates/service.yaml b/devops/gcp/deploy/templates/service.yaml
index d92e1b6fb4b7890067aaf4d6b46c8310162d4d6e..7f88561aad2b46006251e90dc3758e3a7cd0fbc0 100644
--- a/devops/gcp/deploy/templates/service.yaml
+++ b/devops/gcp/deploy/templates/service.yaml
@@ -3,7 +3,9 @@ kind: Service
 metadata:
   name: "{{ .Values.conf.app_name }}"
   annotations:
+  {{- if not .Values.conf.on_prem_enabled }}
     cloud.google.com/neg: '{"ingress": true}'
+  {{- end }}
   namespace: "{{ .Release.Namespace }}"
   labels:
     app: "{{ .Values.conf.app_name }}"
diff --git a/devops/gcp/deploy/values.yaml b/devops/gcp/deploy/values.yaml
index 4def71de06beeac7bcfd4bb8aad3fc201a27c88a..08f3d3731e71523f01819853188e409057aef6bd 100644
--- a/devops/gcp/deploy/values.yaml
+++ b/devops/gcp/deploy/values.yaml
@@ -3,10 +3,13 @@ data:
   requests_memory: "256M"
   limits_cpu: "1"
   limits_memory: "1G"
-  serviceAccountName: ""
+  serviceAccountName: "notification"
   imagePullPolicy: "IfNotPresent"
   image: ""
 
 conf:
   configmap: "notification-config"
   app_name: "notification"
+  rabbitmq_secret_name: "rabbitmq-secret"
+  openid_secret_name: "notification-keycloak-secret"
+  on_prem_enabled: false