diff --git a/playbooks/openshift-apps/languages.yml b/playbooks/openshift-apps/languages.yml
index 5dc633314f..bb9c990a4d 100644
--- a/playbooks/openshift-apps/languages.yml
+++ b/playbooks/openshift-apps/languages.yml
@@ -20,12 +20,12 @@
   - role: openshift/object
     object_app: languages
     object_objectname: imagestream.yml
-    object_template: imagestream.yml
+    object_template: imagestream.yml.j2
 
   - role: openshift/object
     object_app: languages
     object_objectname: buildconfig.yml
-    object_template: buildconfig.yml
+    object_template: buildconfig.yml.j2
 
   - role: openshift/start-build
     start_build_app: languages
@@ -36,7 +36,7 @@
 
   - role: openshift/object
     object_app: languages
-    object_template: service.yml
+    object_template: service.yml.j2
     object_objectname: service.yml
 
   - role: openshift/route
@@ -48,17 +48,17 @@
 
   - role: openshift/object
     object_app: languages
-    object_template: pvc.yml
+    object_template: pvc.yml.j2
     object_objectname: pvc.yml
 
   - role: openshift/object
     object_app: languages
-    object_template: deployment.yml
+    object_template: deployment.yml.j2
     object_objectname: deployment.yml
 
   - role: openshift/object
     object_app: languages
-    object_template: cron.yml
+    object_template: cron.yml.j2
     object_objectname: cron.yml
 
 ###############################################
diff --git a/roles/openshift-apps/languages/templates/buildconfig.yml b/roles/openshift-apps/languages/templates/buildconfig.yml.j2
similarity index 100%
rename from roles/openshift-apps/languages/templates/buildconfig.yml
rename to roles/openshift-apps/languages/templates/buildconfig.yml.j2
diff --git a/roles/openshift-apps/languages/templates/cron.yml b/roles/openshift-apps/languages/templates/cron.yml.j2
similarity index 97%
rename from roles/openshift-apps/languages/templates/cron.yml
rename to roles/openshift-apps/languages/templates/cron.yml.j2
index 1a649b5ea9..7e83e283b8 100644
--- a/roles/openshift-apps/languages/templates/cron.yml
+++ b/roles/openshift-apps/languages/templates/cron.yml.j2
@@ -19,7 +19,7 @@ spec:
             parent: "cron_stats"
         spec:
 {% filter indent(width=10, first=True) %}
-{%     include "cron_template.yml" %}
+{%     include "cron_template.yml.j2" %}
 {% endfilter %}
 ---
 {%   endfor %}
@@ -44,7 +44,7 @@ spec:
             parent: "cron_stats"
         spec:
 {% filter indent(width=10, first=True) %}
-{%     include "cron_template.yml" %}
+{%     include "cron_template.yml.j2" %}
 {% endfilter %}
 ---
 apiVersion: batch/v1
diff --git a/roles/openshift-apps/languages/templates/cron_template.yml b/roles/openshift-apps/languages/templates/cron_template.yml.j2
similarity index 100%
rename from roles/openshift-apps/languages/templates/cron_template.yml
rename to roles/openshift-apps/languages/templates/cron_template.yml.j2
diff --git a/roles/openshift-apps/languages/templates/deployment.yml b/roles/openshift-apps/languages/templates/deployment.yml.j2
similarity index 100%
rename from roles/openshift-apps/languages/templates/deployment.yml
rename to roles/openshift-apps/languages/templates/deployment.yml.j2
diff --git a/roles/openshift-apps/languages/templates/imagestream.yml b/roles/openshift-apps/languages/templates/imagestream.yml.j2
similarity index 100%
rename from roles/openshift-apps/languages/templates/imagestream.yml
rename to roles/openshift-apps/languages/templates/imagestream.yml.j2
diff --git a/roles/openshift-apps/languages/templates/pvc.yml b/roles/openshift-apps/languages/templates/pvc.yml.j2
similarity index 100%
rename from roles/openshift-apps/languages/templates/pvc.yml
rename to roles/openshift-apps/languages/templates/pvc.yml.j2
diff --git a/roles/openshift-apps/languages/templates/service.yml b/roles/openshift-apps/languages/templates/service.yml.j2
similarity index 100%
rename from roles/openshift-apps/languages/templates/service.yml
rename to roles/openshift-apps/languages/templates/service.yml.j2