diff --git a/openshift/templates/django-postgresql.json b/openshift/templates/django-postgresql.json
index a819cb7..0e583da 100644
--- a/openshift/templates/django-postgresql.json
+++ b/openshift/templates/django-postgresql.json
@@ -1,6 +1,6 @@
 {
   "kind": "Template",
-  "apiVersion": "v1beta3",
+  "apiVersion": "v1",
   "metadata": {
     "name": "django-quickstart-source-postgresql",
     "annotations": {
@@ -15,7 +15,7 @@
   "objects": [
     {
       "kind": "Service",
-      "apiVersion": "v1beta3",
+      "apiVersion": "v1",
       "metadata": {
         "name": "${FRONTEND_SERVICE_NAME}",
         "annotations": {
@@ -37,7 +37,7 @@
     },
     {
       "kind": "Service",
-      "apiVersion": "v1beta3",
+      "apiVersion": "v1",
       "metadata": {
         "name": "${DATABASE_SERVICE_NAME}",
         "annotations": {
@@ -59,10 +59,9 @@
     },
     {
       "kind": "Route",
-      "apiVersion": "v1beta3",
+      "apiVersion": "v1",
       "metadata": {
-          "name": "${FRONTEND_SERVICE_NAME}-route",
-          "creationTimestamp": null
+          "name": "${FRONTEND_SERVICE_NAME}-route"
       },
       "spec": {
           "host" : "${FRONTEND_ROUTE}",
@@ -74,7 +73,7 @@
     },
     {
       "kind": "BuildConfig",
-      "apiVersion": "v1beta3",
+      "apiVersion": "v1",
       "metadata": {
         "name": "django-quickstart-source",
         "annotations": {
@@ -106,17 +105,16 @@
         },
         "triggers": [
           {
-            "type": "imageChange",
-            "imageChange": {}
+            "type": "ImageChange"
           },
           {
-            "type": "github",
+            "type": "GitHub",
             "github": {
               "secret": "secret123"
             }
           },
           {
-            "type": "generic",
+            "type": "Generic",
             "generic": {
               "secret": "secret123"
             }
@@ -126,7 +124,7 @@
     },
     {
       "kind": "DeploymentConfig",
-      "apiVersion": "v1beta3",
+      "apiVersion": "v1",
       "metadata": {
         "name": "${FRONTEND_SERVICE_NAME}",
         "annotations": {
@@ -213,7 +211,7 @@
     },
     {
       "kind": "DeploymentConfig",
-      "apiVersion": "v1beta3",
+      "apiVersion": "v1",
       "metadata": {
         "name": "${DATABASE_SERVICE_NAME}",
         "labels": {
@@ -275,7 +273,7 @@
     },
     {
       "kind": "ImageStream",
-      "apiVersion": "v1beta3",
+      "apiVersion": "v1",
       "metadata": {
         "name": "django-quickstart-source",
         "annotations": {
@@ -285,7 +283,7 @@
     },
     {
       "kind": "ImageStream",
-      "apiVersion": "v1beta3",
+      "apiVersion": "v1",
       "metadata": {
         "name": "python-33-centos7",
         "annotations": {
diff --git a/openshift/templates/django.json b/openshift/templates/django.json
index 9ef3d03..0b6180c 100644
--- a/openshift/templates/django.json
+++ b/openshift/templates/django.json
@@ -1,6 +1,6 @@
 {
   "kind": "Template",
-  "apiVersion": "v1beta3",
+  "apiVersion": "v1",
   "metadata": {
     "name": "django-quickstart-source",
     "annotations": {
@@ -15,7 +15,7 @@
   "objects": [
     {
       "kind": "Service",
-      "apiVersion": "v1beta3",
+      "apiVersion": "v1",
       "metadata": {
         "name": "${FRONTEND_SERVICE_NAME}",
         "annotations": {
@@ -37,10 +37,9 @@
     },
     {
       "kind": "Route",
-      "apiVersion": "v1beta3",
+      "apiVersion": "v1",
       "metadata": {
-          "name": "${FRONTEND_SERVICE_NAME}-route",
-          "creationTimestamp": null
+          "name": "${FRONTEND_SERVICE_NAME}-route"
       },
       "spec": {
           "host" : "${FRONTEND_ROUTE}",
@@ -49,10 +48,10 @@
               "name" : "${FRONTEND_SERVICE_NAME}"
           }
       }
-    },    
+    },
     {
       "kind": "BuildConfig",
-      "apiVersion": "v1beta3",
+      "apiVersion": "v1",
       "metadata": {
         "name": "django-quickstart-source",
         "annotations": {
@@ -84,17 +83,16 @@
         },
         "triggers": [
           {
-            "type": "imageChange",
-            "imageChange": {}
+            "type": "ImageChange"
           },
           {
-            "type": "github",
+            "type": "GitHub",
             "github": {
               "secret": "secret123"
             }
           },
           {
-            "type": "generic",
+            "type": "Generic",
             "generic": {
               "secret": "secret123"
             }
@@ -104,7 +102,7 @@
     },
     {
       "kind": "DeploymentConfig",
-      "apiVersion": "v1beta3",
+      "apiVersion": "v1",
       "metadata": {
         "name": "${FRONTEND_SERVICE_NAME}",
         "annotations": {
@@ -191,7 +189,7 @@
     },
     {
       "kind": "ImageStream",
-      "apiVersion": "v1beta3",
+      "apiVersion": "v1",
       "metadata": {
         "name": "django-quickstart-source",
         "annotations": {