diff --git a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile
index 02415578..0d918f52 100644
--- a/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile
+++ b/freeleaps/alpha/ci/freeleaps-service-hub/Jenkinsfile
@@ -8,7 +8,7 @@ executeFreeleapsPipeline {
   serviceGitRepo = "https://gitea.freeleaps.mathmast.com/freeleaps/freeleaps-service-hub.git"
   serviceGitRepoType = 'monorepo'
   serviceGitCredentialsId = 'freeleaps-ops-git-credentials'
-  executeMode = 'fully'
+  executeMode = 'on_demand'
   commitMessageLintEnabled = false
   components = [
      [
diff --git a/freeleaps/alpha/ci/freeleaps2-frontend/Jenkinsfile b/freeleaps/alpha/ci/freeleaps2-frontend/Jenkinsfile
index 5a28ae6f..8f3da98a 100644
--- a/freeleaps/alpha/ci/freeleaps2-frontend/Jenkinsfile
+++ b/freeleaps/alpha/ci/freeleaps2-frontend/Jenkinsfile
@@ -7,7 +7,7 @@ executeFreeleapsPipeline {
   serviceGitRepo = "https://gitea.freeleaps.mathmast.com/products/freeleaps.git"
   serviceGitRepoType = 'monorepo'
   serviceGitCredentialsId = 'freeleaps-repos-gitea-credentails'
-  executeMode = 'fully'
+  executeMode = 'on_demand'
   commitMessageLintEnabled = false
   components = [
     [
diff --git a/freeleaps/helm-pkg/notification/templates/notification/deployment.yaml b/freeleaps/helm-pkg/notification/templates/notification/deployment.yaml
index 7e24451a..9dbad328 100644
--- a/freeleaps/helm-pkg/notification/templates/notification/deployment.yaml
+++ b/freeleaps/helm-pkg/notification/templates/notification/deployment.yaml
@@ -20,6 +20,10 @@ spec:
       app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
       app.kubernetes.io/managed-by: {{ .Release.Service }}
   replicas: {{ .Values.notification.replicas }}
+{{- if .Values.logIngest.enabled }}
+  strategy:
+    type: Recreate
+{{- end }}
   template:
     metadata:
       labels:
@@ -36,8 +40,6 @@ spec:
     spec:
 {{- if .Values.logIngest.enabled }}
       serviceAccountName: "{{ .Release.Name }}-otel-collector"
-      strategy:
-        type: Recreate
 {{- end }}
       containers:
         - name: "notification"
diff --git a/freeleaps/helm-pkg/notification/templates/notification/notification-config.yaml b/freeleaps/helm-pkg/notification/templates/notification/notification-config.yaml
index b0fdc90b..e690e3d4 100644
--- a/freeleaps/helm-pkg/notification/templates/notification/notification-config.yaml
+++ b/freeleaps/helm-pkg/notification/templates/notification/notification-config.yaml
@@ -7,6 +7,7 @@ type: Opaque
 data:
   TZ: {{ .Values.notification.configs.tz | b64enc | quote }}
   APP_NAME: {{ .Values.notification.configs.appName | b64enc | quote }}
+  APP_ENV: {{ .Values.notification.configs.appEnv | default "alpha" | b64enc | quote }}
   SERVICE_API_ACCESS_HOST: {{ .Values.notification.configs.serviceApiAccessHost | b64enc | quote }}
   SERVICE_API_ACCESS_PORT: {{ .Values.notification.configs.serviceApiAccessPort | toString | b64enc }}
   RABBITMQ_HOST: {{ .Values.notification.configs.rabbitmqHost | b64enc | quote }}
diff --git a/freeleaps/helm-pkg/notification/values.alpha.yaml b/freeleaps/helm-pkg/notification/values.alpha.yaml
index 72c37cf2..cd985412 100644
--- a/freeleaps/helm-pkg/notification/values.alpha.yaml
+++ b/freeleaps/helm-pkg/notification/values.alpha.yaml
@@ -78,6 +78,7 @@ notification:
   configs:
     tz: UTC
     appName: notification
+    appEnv: alpha
     serviceApiAccessHost: 0.0.0.0
     serviceApiAccessPort: 8003
     mongodbName: freeleaps2
diff --git a/freeleaps/helm-pkg/notification/values.prod.yaml b/freeleaps/helm-pkg/notification/values.prod.yaml
index c855fe71..e1ce5079 100644
--- a/freeleaps/helm-pkg/notification/values.prod.yaml
+++ b/freeleaps/helm-pkg/notification/values.prod.yaml
@@ -7,6 +7,11 @@ dashboard:
   name: freeleaps-prod-notification-dashboard
   title: Notification Service Dashboard (PROD)
   metricsPrefix: freeleaps_notification
+logIngest:
+  enabled: true
+  lokiEndpoint: http://loki-gateway.freeleaps-logging-system
+  logPathPattern: /app/log/notification/*.log
+  logPath: /app/log/notification
 notification:
   replicas: 1
   image:
@@ -64,6 +69,7 @@ notification:
   configs:
     tz: UTC
     appName: notification
+    appEnv: prod
     serviceApiAccessHost: 0.0.0.0
     serviceApiAccessPort: 8003
     mongodbName: freeleaps2
diff --git a/freeleaps/helm-pkg/payment/templates/payment/payment-config.yaml b/freeleaps/helm-pkg/payment/templates/payment/payment-config.yaml
index 7c78758e..39f5f685 100644
--- a/freeleaps/helm-pkg/payment/templates/payment/payment-config.yaml
+++ b/freeleaps/helm-pkg/payment/templates/payment/payment-config.yaml
@@ -7,6 +7,7 @@ type: Opaque
 data:
   TZ: {{ .Values.payment.configs.tz | b64enc | quote }}
   APP_NAME: {{ .Values.payment.configs.appName | b64enc | quote }}
+  APP_ENV: {{ .Values.payment.configs.appEnv | default "alpha" | b64enc | quote }}
   SERVICE_API_ACCESS_HOST: {{ .Values.payment.configs.serviceApiAccessHost | b64enc | quote }}
   SERVICE_API_ACCESS_PORT: {{ .Values.payment.configs.serviceApiAccessPort | toString | b64enc }}
   MONGODB_NAME: {{ .Values.payment.configs.mongodbName | b64enc | quote }}
diff --git a/freeleaps/helm-pkg/payment/values.alpha.yaml b/freeleaps/helm-pkg/payment/values.alpha.yaml
index 3115ae85..b702ac29 100644
--- a/freeleaps/helm-pkg/payment/values.alpha.yaml
+++ b/freeleaps/helm-pkg/payment/values.alpha.yaml
@@ -78,6 +78,7 @@ payment:
   configs:
     tz: UTC
     appName: payment
+    appEnv: alpha
     serviceApiAccessHost: 0.0.0.0
     serviceApiAccessPort: 8006
     mongodbName: freeleaps2
diff --git a/freeleaps/helm-pkg/payment/values.prod.yaml b/freeleaps/helm-pkg/payment/values.prod.yaml
index 03076934..1140a9fc 100644
--- a/freeleaps/helm-pkg/payment/values.prod.yaml
+++ b/freeleaps/helm-pkg/payment/values.prod.yaml
@@ -7,6 +7,11 @@ dashboard:
   name: freeleaps-prod-payment-dashboard
   title: Payment Service Dashboard (PROD)
   metricsPrefix: freeleaps_payment
+logIngest:
+  enabled: true
+  lokiEndpoint: http://loki-gateway.freeleaps-logging-system
+  logPathPattern: /app/log/payment/*.log
+  logPath: /app/log/payment
 payment:
   replicas: 1
   image:
@@ -64,6 +69,7 @@ payment:
   configs:
     tz: UTC
     appName: payment
+    appEnv: prod
     serviceApiAccessHost: 0.0.0.0
     serviceApiAccessPort: 8006
     mongodbName: freeleaps2