diff --git a/roles/mongodb/tasks/main.yml b/roles/mongodb/tasks/main.yml
index 6826a4ec..d0fc890e 100644
--- a/roles/mongodb/tasks/main.yml
+++ b/roles/mongodb/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Install mongodb on {{ ansible_distribution }}
-  include: mongodb_{{ ansible_pkg_mgr }}.yaml
+  include: mongodb_{{ ansible_pkg_mgr }}.yml
   tags: [databases, mongodb]
 
 - name: Start & Enable mongodb
diff --git a/roles/mongodb/tasks/mongodb_apt.yaml b/roles/mongodb/tasks/mongodb_apt.yml
similarity index 100%
rename from roles/mongodb/tasks/mongodb_apt.yaml
rename to roles/mongodb/tasks/mongodb_apt.yml
diff --git a/roles/mongodb/tasks/mongodb_yum.yaml b/roles/mongodb/tasks/mongodb_yum.yml
similarity index 100%
rename from roles/mongodb/tasks/mongodb_yum.yaml
rename to roles/mongodb/tasks/mongodb_yum.yml
diff --git a/roles/postgresql/meta/main.yaml b/roles/postgresql/meta/main.yml
similarity index 100%
rename from roles/postgresql/meta/main.yaml
rename to roles/postgresql/meta/main.yml
diff --git a/roles/st2/tasks/datastore.yaml b/roles/st2/tasks/datastore.yml
similarity index 100%
rename from roles/st2/tasks/datastore.yaml
rename to roles/st2/tasks/datastore.yml
diff --git a/roles/st2/tasks/main.yml b/roles/st2/tasks/main.yml
index bde50118..a0837dab 100644
--- a/roles/st2/tasks/main.yml
+++ b/roles/st2/tasks/main.yml
@@ -61,7 +61,7 @@
   tags: st2, config
 
 - name: Configure the StackStorm datastore
-  include: datastore.yaml
+  include: datastore.yml
   tags: st2, datastore
 
 - name: Ensure StackStorm services are enabled and running
diff --git a/roles/st2mistral/vars/main.yaml b/roles/st2mistral/vars/main.yml
similarity index 100%
rename from roles/st2mistral/vars/main.yaml
rename to roles/st2mistral/vars/main.yml