diff --git a/playbooks/openshift-apps/openvpn.yml b/playbooks/openshift-apps/openvpn.yml
index 7514b69e69..a58629577b 100644
--- a/playbooks/openshift-apps/openvpn.yml
+++ b/playbooks/openshift-apps/openvpn.yml
@@ -23,48 +23,48 @@
   - role: openshift/object
     object_app: openvpn
     object_objectname: imagestream.yml
-    object_template: imagestream.yml
+    object_template: imagestream.yml.j2
 
   - role: openshift/object
     object_app: openvpn
     object_objectname: buildconfig.yml
-    object_template: buildconfig.yml
+    object_template: buildconfig.yml.j2
 
   - role: openshift/object
     object_app: openvpn
-    object_template: serviceaccount.yml
+    object_template: serviceaccount.yml.j2
     object_objectname: serviceaccount.yml
 
   - role: openshift/object
     object_app: openvpn
-    object_template: scc.yml
+    object_template: scc.yml.j2
     object_objectname: scc.yml
 
   - role: openshift/object
     object_app: openvpn
-    object_template: scc_role.yml
+    object_template: scc_role.yml.j2
     object_objectname: scc_role.yml
 
   - role: openshift/object
     object_app: openvpn
-    object_template: scc_rolebinding.yml
+    object_template: scc_rolebinding.yml.j2
     object_objectname: scc_rolebinding.yml
 
   # load openVPN client certs for each node in ocp_nodes into ocp secret
   # expect certs to be generated in {{private}}/files/vpn/pki/issued/
   - role: openshift/object
     object_app: openvpn
-    object_template: secrets.yml
+    object_template: secrets.yml.j2
     object_objectname: secrets.yml
 
   - role: openshift/object
     object_app: openvpn
-    object_template: configmap.yml
+    object_template: configmap.yml.j2
     object_objectname: configmap.yml
 
   - role: openshift/object
     object_app: openvpn
-    object_template: deployment.yml
+    object_template: deployment.yml.j2
     object_objectname: deployment.yml
 
   - role: openshift/start-build
diff --git a/roles/openshift-apps/openvpn/templates/buildconfig.yml b/roles/openshift-apps/openvpn/templates/buildconfig.yml.j2
similarity index 100%
rename from roles/openshift-apps/openvpn/templates/buildconfig.yml
rename to roles/openshift-apps/openvpn/templates/buildconfig.yml.j2
diff --git a/roles/openshift-apps/openvpn/templates/configmap.yml b/roles/openshift-apps/openvpn/templates/configmap.yml.j2
similarity index 100%
rename from roles/openshift-apps/openvpn/templates/configmap.yml
rename to roles/openshift-apps/openvpn/templates/configmap.yml.j2
diff --git a/roles/openshift-apps/openvpn/templates/deployment.yml b/roles/openshift-apps/openvpn/templates/deployment.yml.j2
similarity index 100%
rename from roles/openshift-apps/openvpn/templates/deployment.yml
rename to roles/openshift-apps/openvpn/templates/deployment.yml.j2
diff --git a/roles/openshift-apps/openvpn/templates/imagestream.yml b/roles/openshift-apps/openvpn/templates/imagestream.yml.j2
similarity index 100%
rename from roles/openshift-apps/openvpn/templates/imagestream.yml
rename to roles/openshift-apps/openvpn/templates/imagestream.yml.j2
diff --git a/roles/openshift-apps/openvpn/templates/scc.yml b/roles/openshift-apps/openvpn/templates/scc.yml.j2
similarity index 100%
rename from roles/openshift-apps/openvpn/templates/scc.yml
rename to roles/openshift-apps/openvpn/templates/scc.yml.j2
diff --git a/roles/openshift-apps/openvpn/templates/scc_role.yml b/roles/openshift-apps/openvpn/templates/scc_role.yml.j2
similarity index 100%
rename from roles/openshift-apps/openvpn/templates/scc_role.yml
rename to roles/openshift-apps/openvpn/templates/scc_role.yml.j2
diff --git a/roles/openshift-apps/openvpn/templates/scc_rolebinding.yml b/roles/openshift-apps/openvpn/templates/scc_rolebinding.yml.j2
similarity index 100%
rename from roles/openshift-apps/openvpn/templates/scc_rolebinding.yml
rename to roles/openshift-apps/openvpn/templates/scc_rolebinding.yml.j2
diff --git a/roles/openshift-apps/openvpn/templates/secrets.yml b/roles/openshift-apps/openvpn/templates/secrets.yml.j2
similarity index 100%
rename from roles/openshift-apps/openvpn/templates/secrets.yml
rename to roles/openshift-apps/openvpn/templates/secrets.yml.j2
diff --git a/roles/openshift-apps/openvpn/templates/serviceaccount.yml b/roles/openshift-apps/openvpn/templates/serviceaccount.yml.j2
similarity index 100%
rename from roles/openshift-apps/openvpn/templates/serviceaccount.yml
rename to roles/openshift-apps/openvpn/templates/serviceaccount.yml.j2