diff --git a/cluster-service/deploy/integration/cluster-service-namespace.yaml b/cluster-service/deploy/integration/cluster-service-namespace.yaml
index fc17783e8..30aaac143 100644
--- a/cluster-service/deploy/integration/cluster-service-namespace.yaml
+++ b/cluster-service/deploy/integration/cluster-service-namespace.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
   name: cluster-service-admin
diff --git a/cluster-service/deploy/openshift-templates/arohcp-db-template.yml b/cluster-service/deploy/openshift-templates/arohcp-db-template.yml
index d8389f1c9..8e2382ea9 100644
--- a/cluster-service/deploy/openshift-templates/arohcp-db-template.yml
+++ b/cluster-service/deploy/openshift-templates/arohcp-db-template.yml
@@ -1,5 +1,5 @@
 ---
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
   annotations:
diff --git a/cluster-service/deploy/openshift-templates/arohcp-namespace-template.yml b/cluster-service/deploy/openshift-templates/arohcp-namespace-template.yml
index d5f9150c6..c8935253c 100644
--- a/cluster-service/deploy/openshift-templates/arohcp-namespace-template.yml
+++ b/cluster-service/deploy/openshift-templates/arohcp-namespace-template.yml
@@ -1,5 +1,5 @@
 ---
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
   name: ocm-cs-ns
diff --git a/cluster-service/deploy/openshift-templates/arohcp-secrets-template.yml b/cluster-service/deploy/openshift-templates/arohcp-secrets-template.yml
index 49bc7baaa..ce2f7f6bf 100644
--- a/cluster-service/deploy/openshift-templates/arohcp-secrets-template.yml
+++ b/cluster-service/deploy/openshift-templates/arohcp-secrets-template.yml
@@ -8,7 +8,7 @@
 
 ---
 
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
   name: clusters-service-secrets
diff --git a/cluster-service/deploy/openshift-templates/arohcp-service-template.yml b/cluster-service/deploy/openshift-templates/arohcp-service-template.yml
index 53476bc51..494be3cd3 100644
--- a/cluster-service/deploy/openshift-templates/arohcp-service-template.yml
+++ b/cluster-service/deploy/openshift-templates/arohcp-service-template.yml
@@ -3,7 +3,7 @@
 
 ---
 
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
   name: clusters-service