diff --git a/openshift/templates/backup-cronjob/backup-cronjob.yaml b/openshift/templates/backup-cronjob/backup-cronjob.yaml
index f117e47..b19239f 100644
--- a/openshift/templates/backup-cronjob/backup-cronjob.yaml
+++ b/openshift/templates/backup-cronjob/backup-cronjob.yaml
@@ -1,6 +1,6 @@
 ---
 kind: "Template"
-apiVersion: "v1"
+apiVersion: "template.openshift.io/v1"
 metadata:
   name: "{$JOB_NAME}-cronjob-template"
   annotations:
@@ -27,18 +27,18 @@ parameters:
     displayName: "Source Image Name"
     description: "The name of the image to use for this resource."
     required: true
-    value: "backup-postgres"
+    value: "backup-container"
   - name: "IMAGE_REGISTRY"
     description: "The base OpenShift docker registry"
     displayName: "Docker Image Registry"
     required: true
     # Set value to "docker-registry.default.svc:5000" if using OCP3
-    value: "image-registry.openshift-image-registry.svc:5000"
+    value: "docker.io"
   - name: "IMAGE_NAMESPACE"
     displayName: "Image Namespace"
     description: "The namespace of the OpenShift project containing the imagestream for the application."
     required: true
-    value: "backup-container"
+    value: "bcgovimages"
   - name: "TAG_NAME"
     displayName: "Environment TAG name"
     description: "The TAG name for this environment, e.g., dev, test, prod"
diff --git a/openshift/templates/backup/backup-build.yaml b/openshift/templates/backup/backup-build.yaml
index c196177..0dfa0e5 100644
--- a/openshift/templates/backup/backup-build.yaml
+++ b/openshift/templates/backup/backup-build.yaml
@@ -1,5 +1,5 @@
 kind: Template
-apiVersion: v1
+apiVersion: "template.openshift.io/v1"
 metadata:
   name: ${NAME}-build-template
   creationTimestamp: null
diff --git a/openshift/templates/backup/backup-deploy.yaml b/openshift/templates/backup/backup-deploy.yaml
index 4eceea6..94efdb3 100644
--- a/openshift/templates/backup/backup-deploy.yaml
+++ b/openshift/templates/backup/backup-deploy.yaml
@@ -1,5 +1,5 @@
 kind: Template
-apiVersion: v1
+apiVersion: "template.openshift.io/v1"
 metadata:
   name: ${NAME}-deployment-template
 objects:
diff --git a/openshift/templates/nsp/build.yaml b/openshift/templates/nsp/build.yaml
index 83ead63..031e6bc 100644
--- a/openshift/templates/nsp/build.yaml
+++ b/openshift/templates/nsp/build.yaml
@@ -1,6 +1,6 @@
 ---
 kind: Template
-apiVersion: v1
+apiVersion: "template.openshift.io/v1"
 metadata:
   name: global-nsp-build-template
 objects:
diff --git a/openshift/templates/nsp/deploy.yaml b/openshift/templates/nsp/deploy.yaml
index db3e6eb..6dab41e 100644
--- a/openshift/templates/nsp/deploy.yaml
+++ b/openshift/templates/nsp/deploy.yaml
@@ -1,6 +1,6 @@
 ---
 kind: Template
-apiVersion: v1
+apiVersion: "template.openshift.io/v1"
 metadata:
   name: global-nsp-build-template
 objects: