diff --git a/openshift/templates/agent/agent-deploy.yaml b/openshift/templates/agent/agent-deploy.yaml
index 41206a1..2ce534d 100644
--- a/openshift/templates/agent/agent-deploy.yaml
+++ b/openshift/templates/agent/agent-deploy.yaml
@@ -148,8 +148,8 @@ objects:
       admin-api-key: ${ADMIN_API_KEY}
     type: Opaque
 
-  - kind: DeploymentConfig
-    apiVersion: v1
+  - kind: Deployment
+    apiVersion: apps/v1
     metadata:
       name: ${NAME}${SUFFIX}
       labels:
@@ -159,17 +159,13 @@ objects:
         app-group: ${APP_GROUP}
         role: ${ROLE}
         env: ${TAG_NAME}
-      annotations:
-        description: Defines how to deploy the application server
-        app.openshift.io/connects-to: >-
-          [{"apiVersion":"apps.openshift.io/v1","kind":"DeploymentConfig","name":"${WALLET_HOST}${SUFFIX}"},
-          {"apiVersion":"apps.openshift.io/v1","kind":"DeploymentConfig","name":"${API_HOST}${SUFFIX}"}]
     spec:
       replicas: 1
       selector:
-        name: ${NAME}${SUFFIX}
+        matchLabels:
+          name: ${NAME}${SUFFIX}
       strategy:
-        type: Rolling
+        type: RollingUpdate
       template:
         metadata:
           name: ${NAME}${SUFFIX}
@@ -297,7 +293,7 @@ objects:
                   value: ${AGENT_TRACE_TAG}
                 - name: TRACE_LABEL
                   value: ${AGENT_TRACE_LABEL}
-              image:
+              image: image-registry.openshift-image-registry.svc:5000/${IMAGE_NAMESPACE}/${NAME}:${TAG_NAME}
               ports:
                 - containerPort: ${{AGENT_ADMIN_PORT}}
                   protocol: TCP
@@ -336,18 +332,6 @@ objects:
           schedulerName: default-scheduler
           securityContext: {}
           terminationGracePeriodSeconds: 30
-      triggers:
-        - type: ConfigChange
-        - type: ImageChange
-          imageChangeParams:
-            automatic: true
-            containerNames:
-              - ${NAME}${SUFFIX}
-            from:
-              kind: ImageStreamTag
-              name: ${NAME}:${TAG_NAME}
-              namespace: ${IMAGE_NAMESPACE}
-
   - kind: HorizontalPodAutoscaler
     apiVersion: autoscaling/v1
     metadata:
@@ -361,8 +345,8 @@ objects:
         env: ${TAG_NAME}
     spec:
       scaleTargetRef:
-        apiVersion: apps.openshift.io/v1 
-        kind: DeploymentConfig
+        apiVersion: apps/v1
+        kind: Deployment
         name: ${NAME}${SUFFIX}
       minReplicas: ${{MIN_REPLICAS}}
       maxReplicas: ${{MAX_REPLICAS}}
diff --git a/openshift/templates/backup/backup-deploy.overrides.sh b/openshift/templates/backup/backup-deploy.overrides.sh
index d5d36b3..c6675f5 100755
--- a/openshift/templates/backup/backup-deploy.overrides.sh
+++ b/openshift/templates/backup/backup-deploy.overrides.sh
@@ -15,7 +15,7 @@ CONFIG_MAP_NAME=backup-conf-primary
 SOURCE_FILE=$( dirname "$0" )/config/backup.conf
 
 OUTPUT_FORMAT=json
-OUTPUT_FILE=${CONFIG_MAP_NAME}-configmap_DeploymentConfig.json
+OUTPUT_FILE=${CONFIG_MAP_NAME}-configmap_Deployment.json
 
 printStatusMsg "Generating ConfigMap; ${CONFIG_MAP_NAME} ..."
 generateConfigMap "${CONFIG_MAP_NAME}" "${SOURCE_FILE}" "${OUTPUT_FORMAT}" "${OUTPUT_FILE}"
@@ -30,4 +30,4 @@ else
 fi
 
 SPECIALDEPLOYPARMS="--param-file=${_overrideParamFile}"
-echo ${SPECIALDEPLOYPARMS}
\ No newline at end of file
+echo ${SPECIALDEPLOYPARMS}
diff --git a/openshift/templates/backup/backup-deploy.yaml b/openshift/templates/backup/backup-deploy.yaml
index a9c6ad0..3c1b084 100644
--- a/openshift/templates/backup/backup-deploy.yaml
+++ b/openshift/templates/backup/backup-deploy.yaml
@@ -58,8 +58,8 @@ objects:
       webhook-url: ${WEBHOOK_URL}
     type: Opaque
 
-  - kind: DeploymentConfig
-    apiVersion: v1
+  - kind: Deployment
+    apiVersion: apps/v1
     metadata:
       name: ${NAME}${SUFFIX}
       labels:
@@ -69,30 +69,13 @@ objects:
         app-group: ${APP_GROUP}
         role: ${ROLE}
         env: ${TAG_NAME}
-      annotations:
-        description: Defines how to deploy the application server
-        app.openshift.io/connects-to: >-
-          [{"apiVersion":"apps.openshift.io/v1","kind":"DeploymentConfig","name":"${WALLET_DB_HOST}${SUFFIX}"},
-          {"apiVersion":"apps.openshift.io/v1","kind":"DeploymentConfig","name":"${DATABASE_HOST}${SUFFIX}"}]
-      annotations:
-        description: Defines how to deploy the ${NAME}${SUFFIX} server
     spec:
       strategy:
         type: Recreate
-      triggers:
-        - type: ConfigChange
-        - type: ImageChange
-          imageChangeParams:
-            automatic: true
-            containerNames:
-              - ${NAME}${SUFFIX}
-            from:
-              kind: ImageStreamTag
-              namespace: ${IMAGE_NAMESPACE}
-              name: ${SOURCE_IMAGE_NAME}:${TAG_NAME}
       replicas: 1
       selector:
-        name: ${NAME}${SUFFIX}
+        matchLabels:
+          name: ${NAME}${SUFFIX}
       template:
         metadata:
           name: ${NAME}${SUFFIX}
@@ -119,7 +102,7 @@ objects:
                     path: ${CONFIG_FILE_NAME}
           containers:
             - name: ${NAME}${SUFFIX}
-              image:
+              image: image-registry.openshift-image-registry.svc:5000/${IMAGE_NAMESPACE}/${NAME}:${TAG_NAME}
               ports: []
               env:
                 - name: BACKUP_STRATEGY
diff --git a/openshift/templates/bc-reg-fdw/bc-reg-fdw-deploy.yaml b/openshift/templates/bc-reg-fdw/bc-reg-fdw-deploy.yaml
index 7885401..e70cac7 100644
--- a/openshift/templates/bc-reg-fdw/bc-reg-fdw-deploy.yaml
+++ b/openshift/templates/bc-reg-fdw/bc-reg-fdw-deploy.yaml
@@ -57,8 +57,8 @@ objects:
           app: ${APP_NAME}${SUFFIX}
           env: ${TAG_NAME}
 
-  - kind: DeploymentConfig
-    apiVersion: v1
+  - kind: Deployment
+    apiVersion: apps/v1
     metadata:
       name: ${NAME}${SUFFIX}
       labels:
@@ -71,24 +71,10 @@ objects:
     spec:
       strategy:
         type: Recreate
-        recreateParams:
-          timeoutSeconds: 600
-        resources: {}
-        activeDeadlineSeconds: 21600
-      triggers:
-        - type: ImageChange
-          imageChangeParams:
-            automatic: true
-            containerNames:
-              - ${NAME}${SUFFIX}
-            from:
-              kind: ImageStreamTag
-              namespace: ${IMAGE_NAMESPACE}
-              name: ${SOURCE_IMAGE_NAME}:${TAG_NAME}
-        - type: ConfigChange
       replicas: 1
       selector:
-        name: ${NAME}${SUFFIX}
+        matchLabels:
+          name: ${NAME}${SUFFIX}
       template:
         metadata:
           name: ${NAME}${SUFFIX}
@@ -107,7 +93,7 @@ objects:
                 claimName: ${NAME}${SUFFIX}
           containers:
             - name: ${NAME}${SUFFIX}
-              image:
+              image: image-registry.openshift-image-registry.svc:5000/${IMAGE_NAMESPACE}/${NAME}:${TAG_NAME}
               ports:
                 - containerPort: 5432
                   protocol: TCP
diff --git a/openshift/templates/bcreg-controller/bcreg-controller-deploy.yaml b/openshift/templates/bcreg-controller/bcreg-controller-deploy.yaml
index 5bb9ad9..bc89c04 100644
--- a/openshift/templates/bcreg-controller/bcreg-controller-deploy.yaml
+++ b/openshift/templates/bcreg-controller/bcreg-controller-deploy.yaml
@@ -85,8 +85,8 @@ objects:
       selector:
         name: ${NAME}${SUFFIX}
 
-  - kind: DeploymentConfig
-    apiVersion: v1
+  - kind: Deployment
+    apiVersion: apps/v1
     metadata:
       name: ${NAME}${SUFFIX}
       labels:
@@ -96,35 +96,13 @@ objects:
         app-group: ${APP_GROUP}
         role: ${ROLE}
         env: ${TAG_NAME}
-      annotations:
-        description: Defines how to deploy the application server
-        app.openshift.io/connects-to: >-
-          [{"apiVersion":"apps.openshift.io/v1","kind":"DeploymentConfig","name":"${AGENT_HOST}${SUFFIX}"}]
-      annotations:
-        description: Defines how to deploy the container.
     spec:
       strategy:
-        type: Rolling
-        rollingParams:
-          updatePeriodSeconds: 1
-          intervalSeconds: 1
-          timeoutSeconds: 600
-          maxUnavailable: 25%
-          maxSurge: 25%
-      triggers:
-        - type: ConfigChange
-        - type: ImageChange
-          imageChangeParams:
-            automatic: true
-            containerNames:
-              - ${NAME}${SUFFIX}
-            from:
-              kind: ImageStreamTag
-              namespace: ${IMAGE_NAMESPACE}
-              name: ${NAME}:${TAG_NAME}
+        type: RollingUpdate
       replicas: 1
       selector:
-        name: ${NAME}${SUFFIX}
+        matchLabels:
+          name: ${NAME}${SUFFIX}
       template:
         metadata:
           name: ${NAME}${SUFFIX}
@@ -138,7 +116,7 @@ objects:
         spec:
           containers:
             - name: ${NAME}${SUFFIX}
-              image:  
+              image: image-registry.openshift-image-registry.svc:5000/${IMAGE_NAMESPACE}/${NAME}:${TAG_NAME}
               ports:
                 - containerPort: ${{HOST_PORT}}
                   protocol: TCP
@@ -205,8 +183,8 @@ objects:
         env: ${TAG_NAME}
     spec:
       scaleTargetRef:
-        apiVersion: apps.openshift.io/v1 
-        kind: DeploymentConfig
+        apiVersion: apps/v1
+        kind: Deployment
         name: ${NAME}${SUFFIX}
       minReplicas: ${{MIN_REPLICAS}}
       maxReplicas: ${{MAX_REPLICAS}}
diff --git a/openshift/templates/event-db/event-db-deploy.yaml b/openshift/templates/event-db/event-db-deploy.yaml
index 4c973fa..92569f3 100644
--- a/openshift/templates/event-db/event-db-deploy.yaml
+++ b/openshift/templates/event-db/event-db-deploy.yaml
@@ -57,8 +57,8 @@ objects:
           app: ${APP_NAME}${SUFFIX}
           env: ${TAG_NAME}
 
-  - kind: DeploymentConfig
-    apiVersion: v1
+  - kind: Deployment
+    apiVersion: apps/v1
     metadata:
       name: ${NAME}${SUFFIX}
       generation: 1
@@ -72,25 +72,11 @@ objects:
     spec:
       strategy:
         type: Recreate
-        recreateParams:
-          timeoutSeconds: 600
-        resources: {}
-        activeDeadlineSeconds: 21600
-      triggers:
-        - type: ImageChange
-          imageChangeParams:
-            automatic: true
-            containerNames:
-              - ${NAME}${SUFFIX}
-            from:
-              kind: ImageStreamTag
-              namespace: ${IMAGE_NAMESPACE}
-              name: ${SOURCE_IMAGE_NAME}:${TAG_NAME}
-        - type: ConfigChange
       replicas: 1
       test: false
       selector:
-        name: ${NAME}${SUFFIX}
+        matchLabels:
+          name: ${NAME}${SUFFIX}
       template:
         metadata:
           name: ${NAME}${SUFFIX}
@@ -109,7 +95,7 @@ objects:
                 claimName: ${NAME}${SUFFIX}
           containers:
             - name: ${NAME}${SUFFIX}
-              image:  
+              image: image-registry.openshift-image-registry.svc:5000/${IMAGE_NAMESPACE}/${NAME}:${TAG_NAME}
               ports:
                 - containerPort: 5432
                   protocol: TCP
diff --git a/openshift/templates/event-processor-log-db/event-processor-log-db-deploy.yaml b/openshift/templates/event-processor-log-db/event-processor-log-db-deploy.yaml
index 63a9c22..fb73c13 100644
--- a/openshift/templates/event-processor-log-db/event-processor-log-db-deploy.yaml
+++ b/openshift/templates/event-processor-log-db/event-processor-log-db-deploy.yaml
@@ -48,8 +48,8 @@ objects:
           app: ${APP_NAME}${SUFFIX}
           env: ${TAG_NAME}
 
-  - kind: DeploymentConfig
-    apiVersion: v1
+  - kind: Deployment
+    apiVersion: apps/v1
     metadata:
       name: ${NAME}${SUFFIX}
       generation: 1
@@ -63,25 +63,11 @@ objects:
     spec:
       strategy:
         type: Recreate
-        recreateParams:
-          timeoutSeconds: 600
-        resources: {}
-        activeDeadlineSeconds: 21600
-      triggers:
-        - type: ImageChange
-          imageChangeParams:
-            automatic: true
-            containerNames:
-              - ${NAME}${SUFFIX}
-            from:
-              kind: ImageStreamTag
-              namespace: ${IMAGE_NAMESPACE}
-              name: ${SOURCE_IMAGE_NAME}:${TAG_NAME}
-        - type: ConfigChange
       replicas: 1
       test: false
       selector:
-        name: ${NAME}${SUFFIX}
+        matchLabels:
+          name: ${NAME}${SUFFIX}
       template:
         metadata:
           name: ${NAME}${SUFFIX}
@@ -100,7 +86,7 @@ objects:
                 claimName: ${NAME}${SUFFIX}
           containers:
             - name: ${NAME}${SUFFIX}
-              image:  
+              image: image-registry.openshift-image-registry.svc:5000/${IMAGE_NAMESPACE}/${NAME}:${TAG_NAME}
               ports:
                 - containerPort: 5432
                   protocol: TCP
diff --git a/openshift/templates/event-processor/event-processor-deploy.yaml b/openshift/templates/event-processor/event-processor-deploy.yaml
index 175232b..4b68892 100644
--- a/openshift/templates/event-processor/event-processor-deploy.yaml
+++ b/openshift/templates/event-processor/event-processor-deploy.yaml
@@ -48,8 +48,8 @@ objects:
       selector:
         name: ${NAME}${SUFFIX}
 
-  - kind: DeploymentConfig
-    apiVersion: v1
+  - kind: Deployment
+    apiVersion: apps/v1
     metadata:
       name: ${NAME}${SUFFIX}
       labels:
@@ -59,33 +59,9 @@ objects:
         app-group: ${APP_GROUP}
         role: ${ROLE}
         env: ${TAG_NAME}
-      annotations:
-        description: Defines how to deploy the application server
-        app.openshift.io/connects-to: >-
-          [{"apiVersion":"apps.openshift.io/v1","kind":"DeploymentConfig","name":"${MARA_DB_HOST}${SUFFIX}"},
-          {"apiVersion":"apps.openshift.io/v1","kind":"DeploymentConfig","name":"${EVENT_PROC_DB_HOST}${SUFFIX}"},
-          {"apiVersion":"apps.openshift.io/v1","kind":"DeploymentConfig","name":"${BC_REG_DB_HOST}${SUFFIX}"},
-          {"apiVersion":"apps.openshift.io/v1","kind":"DeploymentConfig","name":"${API_HOST}${SUFFIX}"}]
     spec:
       strategy:
-        type: Rolling
-        rollingParams:
-          updatePeriodSeconds: 1
-          intervalSeconds: 1
-          timeoutSeconds: 600
-          maxUnavailable: 25%
-          maxSurge: 25%
-      triggers:
-        - type: ConfigChange
-        - type: ImageChange
-          imageChangeParams:
-            automatic: true
-            containerNames:
-              - ${NAME}${SUFFIX}
-            from:
-              kind: ImageStreamTag
-              namespace: ${IMAGE_NAMESPACE}
-              name: ${NAME}:${TAG_NAME}
+        type: RollingUpdate
       replicas: 1
       selector:
         name: ${NAME}${SUFFIX}
@@ -102,7 +78,7 @@ objects:
         spec:
           containers:
             - name: ${NAME}${SUFFIX}
-              image:
+              image: image-registry.openshift-image-registry.svc:5000/${IMAGE_NAMESPACE}/${NAME}:${TAG_NAME}
               ports:
                 - containerPort: 8080
                   protocol: TCP
diff --git a/openshift/templates/schema-spy-oracle/schema-spy-oracle-deploy.overrides.sh b/openshift/templates/schema-spy-oracle/schema-spy-oracle-deploy.overrides.sh
index 4c2f00e..b749727 100755
--- a/openshift/templates/schema-spy-oracle/schema-spy-oracle-deploy.overrides.sh
+++ b/openshift/templates/schema-spy-oracle/schema-spy-oracle-deploy.overrides.sh
@@ -17,7 +17,7 @@ fi
 CONFIG_MAP_NAME=${CONFIG_MAP_NAME:-schema-spy-oracle-caddy-conf-primary}
 SOURCE_FILE=$( dirname "$0" )/Caddyfile
 OUTPUT_FORMAT=json
-OUTPUT_FILE=${CONFIG_MAP_NAME}-configmap_DeploymentConfig.json
+OUTPUT_FILE=${CONFIG_MAP_NAME}-configmap_Deployment.json
 
 printStatusMsg "Generating ConfigMap; ${CONFIG_MAP_NAME} ..."
 generateConfigMap "${CONFIG_MAP_NAME}${SUFFIX}" "${SOURCE_FILE}" "${OUTPUT_FORMAT}" "${OUTPUT_FILE}"
@@ -37,4 +37,4 @@ else
 fi
 
 SPECIALDEPLOYPARMS="--param-file=${_overrideParamFile}"
-echo ${SPECIALDEPLOYPARMS}
\ No newline at end of file
+echo ${SPECIALDEPLOYPARMS}
diff --git a/openshift/templates/schema-spy-oracle/schema-spy-oracle-deploy.yaml b/openshift/templates/schema-spy-oracle/schema-spy-oracle-deploy.yaml
index 9836ad9..c491f4c 100644
--- a/openshift/templates/schema-spy-oracle/schema-spy-oracle-deploy.yaml
+++ b/openshift/templates/schema-spy-oracle/schema-spy-oracle-deploy.yaml
@@ -92,8 +92,8 @@ objects:
         kind: Service
         name: ${NAME}${SUFFIX}
 
-  - kind: DeploymentConfig
-    apiVersion: v1
+  - kind: Deployment
+    apiVersion: apps/v1
     metadata:
       name: ${NAME}${SUFFIX}
       annotations:
@@ -105,28 +105,9 @@ objects:
         app-group: ${APP_GROUP}
         role: ${ROLE}
         env: ${TAG_NAME}
-      annotations:
-        description: Defines how to deploy the application server
-        app.openshift.io/connects-to: >-
-          [{"apiVersion":"apps.openshift.io/v1","kind":"DeploymentConfig","name":"${DATABASE_HOST}${SUFFIX}"}]
     spec:
       strategy:
         type: Recreate
-        recreateParams:
-          timeoutSeconds: 600
-        resources: {}
-        activeDeadlineSeconds: 21600
-      triggers:
-        - type: ConfigChange
-        - type: ImageChange
-          imageChangeParams:
-            automatic: true
-            containerNames:
-              - ${NAME}${SUFFIX}
-            from:
-              kind: ImageStreamTag
-              namespace: ${IMAGE_NAMESPACE}
-              name: ${SOURCE_IMAGE_NAME}:${TAG_NAME}
       replicas: 1
       selector:
         name: ${NAME}${SUFFIX}
@@ -143,7 +124,7 @@ objects:
         spec:
           containers:
             - name: ${NAME}${SUFFIX}
-              image:  
+              image: image-registry.openshift-image-registry.svc:5000/${IMAGE_NAMESPACE}/${NAME}:${TAG_NAME}
               ports:
                 - containerPort: 8080
                   protocol: TCP
diff --git a/openshift/templates/wallet/wallet-deploy.yaml b/openshift/templates/wallet/wallet-deploy.yaml
index ea06312..ce4e977 100644
--- a/openshift/templates/wallet/wallet-deploy.yaml
+++ b/openshift/templates/wallet/wallet-deploy.yaml
@@ -48,8 +48,8 @@ objects:
           app: ${APP_NAME}${SUFFIX}
           env: ${TAG_NAME}
 
-  - kind: DeploymentConfig
-    apiVersion: v1
+  - kind: Deployment
+    apiVersion: apps/v1
     metadata:
       name: ${NAME}${SUFFIX}
       generation: 1
@@ -63,25 +63,11 @@ objects:
     spec:
       strategy:
         type: Recreate
-        recreateParams:
-          timeoutSeconds: 600
-        resources: {}
-        activeDeadlineSeconds: 21600
-      triggers:
-        - type: ImageChange
-          imageChangeParams:
-            automatic: true
-            containerNames:
-              - ${NAME}${SUFFIX}
-            from:
-              kind: ImageStreamTag
-              namespace: ${IMAGE_NAMESPACE}
-              name: ${SOURCE_IMAGE_NAME}:${TAG_NAME}
-        - type: ConfigChange
       replicas: 1
       test: false
       selector:
-        name: ${NAME}${SUFFIX}
+        matchLabels:
+          name: ${NAME}${SUFFIX}
       template:
         metadata:
           name: ${NAME}${SUFFIX}
@@ -100,7 +86,7 @@ objects:
                 claimName: ${NAME}${SUFFIX}
           containers:
             - name: ${NAME}${SUFFIX}
-              image:  
+              image: image-registry.openshift-image-registry.svc:5000/${IMAGE_NAMESPACE}/${NAME}:${TAG_NAME}
               ports:
                 - containerPort: 5432
                   protocol: TCP