diff --git a/.pipeline/lib/config.js b/.pipeline/lib/config.js
index 00d27557..72394f66 100644
--- a/.pipeline/lib/config.js
+++ b/.pipeline/lib/config.js
@@ -63,7 +63,7 @@ const phases = {
     client_memory: "100Mi",
   },
   uat: {
-    namespace: "d3d940-test",
+    namespace: "d3d940-uat",
     name: `${name}`,
     phase: "uat",
     changeId: changeId,
diff --git a/openshift/client-deploy-config.yaml b/openshift/client-deploy-config.yaml
index f72c45a4..b9fb2cb9 100644
--- a/openshift/client-deploy-config.yaml
+++ b/openshift/client-deploy-config.yaml
@@ -63,6 +63,16 @@ objects:
                 - name: HMCR_DEPLOY_SUFFIX
                   value: ${SUFFIX}
       test: false
+      triggers:
+        - imageChangeParams:
+            automatic: true
+            containerNames:
+              - client
+            from:
+              kind: ImageStreamTag
+              name: ${NAME}:${VERSION}
+          type: ImageChange
+        - type: ConfigChange
   - apiVersion: v1
     kind: Service
     metadata:
diff --git a/openshift/hangfire-deploy-config.yaml b/openshift/hangfire-deploy-config.yaml
index 5ebc3e8d..f399420d 100644
--- a/openshift/hangfire-deploy-config.yaml
+++ b/openshift/hangfire-deploy-config.yaml
@@ -101,6 +101,16 @@ objects:
                 defaultMode: 420
                 name: api-appsettings-${ENV}
       test: false
+      triggers:
+        - imageChangeParams:
+            automatic: true
+            containerNames:
+              - hangfire
+            from:
+              kind: ImageStreamTag
+              name: ${NAME}:${VERSION}
+          type: ImageChange
+        - type: ConfigChange
   - apiVersion: v1
     kind: Service
     metadata:
diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml
index f258f2bc..df5dc71f 100644
--- a/openshift/postgresql-deploy-config.yaml
+++ b/openshift/postgresql-deploy-config.yaml
@@ -87,6 +87,17 @@ objects:
                 persistentVolumeClaim:
                   claimName: ${NAME}${SUFFIX}
       test: false
+      triggers:
+        - type: ConfigChange
+        - imageChangeParams:
+            automatic: true
+            containerNames:
+              - ${NAME}${SUFFIX}
+            from:
+              kind: ImageStreamTag
+              name: ${IMAGE_STREAM_TAG}
+              namespace: d3d940-tools
+          type: ImageChange
   - kind: PersistentVolumeClaim
     apiVersion: v1
     metadata:
@@ -102,6 +113,8 @@ objects:
     apiVersion: v1
     metadata:
       name: ${NAME}${SUFFIX}
+    selector:
+        app: ${NAME}${SUFFIX}
     spec:
       ports:
         - name: postgresql