diff --git a/amq/amq63-basic.json b/amq/amq63-basic.json
index a58cb335..16e63b1c 100644
--- a/amq/amq63-basic.json
+++ b/amq/amq63-basic.json
@@ -1,6 +1,6 @@
 {
     "kind": "Template",
-    "apiVersion": "v1",
+    "apiVersion": "template.openshift.io/v1",
     "metadata": {
         "annotations": {
             "description": "Application template for JBoss A-MQ brokers. These can be deployed as standalone or in a mesh. This template doesn't feature SSL support.",
@@ -224,7 +224,7 @@
         },
         {
             "kind": "DeploymentConfig",
-            "apiVersion": "v1",
+            "apiVersion": "apps.openshift.io/v1",
             "metadata": {
                 "name": "${APPLICATION_NAME}-amq",
                 "labels": {
diff --git a/amq/amq63-persistent-ssl.json b/amq/amq63-persistent-ssl.json
index 3cf80802..e69df1e3 100644
--- a/amq/amq63-persistent-ssl.json
+++ b/amq/amq63-persistent-ssl.json
@@ -1,6 +1,6 @@
 {
     "kind": "Template",
-    "apiVersion": "v1",
+    "apiVersion": "template.openshift.io/v1",
     "metadata": {
         "annotations": {
             "iconClass": "icon-amq",
@@ -372,7 +372,7 @@
         },
         {
             "kind": "DeploymentConfig",
-            "apiVersion": "v1",
+            "apiVersion": "apps.openshift.io/v1",
             "metadata": {
                 "name": "${APPLICATION_NAME}-amq",
                 "labels": {
@@ -587,7 +587,7 @@
         },
         {
             "kind": "DeploymentConfig",
-            "apiVersion": "v1",
+            "apiVersion": "apps.openshift.io/v1",
             "metadata": {
                 "name": "${APPLICATION_NAME}-drainer",
                 "labels": {
diff --git a/amq/amq63-persistent.json b/amq/amq63-persistent.json
index f2077a92..f28ac14a 100644
--- a/amq/amq63-persistent.json
+++ b/amq/amq63-persistent.json
@@ -1,6 +1,6 @@
 {
     "kind": "Template",
-    "apiVersion": "v1",
+    "apiVersion": "template.openshift.io/v1",
     "metadata": {
         "annotations": {
             "iconClass": "icon-amq",
@@ -241,7 +241,7 @@
         },
         {
             "kind": "DeploymentConfig",
-            "apiVersion": "v1",
+            "apiVersion": "apps.openshift.io/v1",
             "metadata": {
                 "name": "${APPLICATION_NAME}-amq",
                 "labels": {
@@ -405,7 +405,7 @@
         },
         {
             "kind": "DeploymentConfig",
-            "apiVersion": "v1",
+            "apiVersion": "apps.openshift.io/v1",
             "metadata": {
                 "name": "${APPLICATION_NAME}-drainer",
                 "labels": {
diff --git a/amq/amq63-ssl.json b/amq/amq63-ssl.json
index 28b7569d..2c53e032 100644
--- a/amq/amq63-ssl.json
+++ b/amq/amq63-ssl.json
@@ -1,6 +1,6 @@
 {
     "kind": "Template",
-    "apiVersion": "v1",
+    "apiVersion": "apps.openshift.io/v1",
     "metadata": {
         "annotations": {
             "iconClass": "icon-amq",
@@ -358,7 +358,7 @@
         },
         {
             "kind": "DeploymentConfig",
-            "apiVersion": "v1",
+            "apiVersion": "apps.openshift.io/v1",
             "metadata": {
                 "name": "${APPLICATION_NAME}-amq",
                 "labels": {