diff --git a/defaults/main.yml b/defaults/main.yaml
similarity index 100%
rename from defaults/main.yml
rename to defaults/main.yaml
diff --git a/meta/main.yml b/meta/main.yaml
similarity index 100%
rename from meta/main.yml
rename to meta/main.yaml
diff --git a/tasks/git_user.yml b/tasks/git_user.yaml
similarity index 100%
rename from tasks/git_user.yml
rename to tasks/git_user.yaml
diff --git a/tasks/main.yml b/tasks/main.yaml
similarity index 83%
rename from tasks/main.yml
rename to tasks/main.yaml
index 70d8f66..70d316e 100644
--- a/tasks/main.yml
+++ b/tasks/main.yaml
@@ -1,7 +1,7 @@
 ---
 
 - name: Include OS-specific variables
-  ansible.builtin.include_vars: "{{ ansible_os_family }}.yml"
+  ansible.builtin.include_vars: "{{ ansible_facts['os_family'] }}.yaml"
 
 - name: Install git and dependencies
   vars:
@@ -19,6 +19,6 @@
     with_items: "{{ _git_package_names }}"
 
 - name: Configure git
-  ansible.builtin.include_tasks: git_user.yml
+  ansible.builtin.include_tasks: git_user.yaml
   with_dict:
   - "{{ git_users }}"
diff --git a/vars/Archlinux.yml b/vars/Archlinux.yaml
similarity index 100%
rename from vars/Archlinux.yml
rename to vars/Archlinux.yaml
diff --git a/vars/Debian.yml b/vars/Debian.yaml
similarity index 100%
rename from vars/Debian.yml
rename to vars/Debian.yaml
diff --git a/vars/RedHat.yml b/vars/RedHat.yaml
similarity index 100%
rename from vars/RedHat.yml
rename to vars/RedHat.yaml