diff --git a/inventory/group_vars/all b/inventory/group_vars/all.yml
similarity index 100%
rename from inventory/group_vars/all
rename to inventory/group_vars/all.yml
diff --git a/inventory/group_vars/vms b/inventory/group_vars/vms.yml
similarity index 100%
rename from inventory/group_vars/vms
rename to inventory/group_vars/vms.yml
diff --git a/inventory/host_vars/gw03-new b/inventory/host_vars/gw03-new
deleted file mode 100644
index c99152c..0000000
--- a/inventory/host_vars/gw03-new
+++ /dev/null
@@ -1 +0,0 @@
-ansible_python_interpreter: /usr/bin/python2
diff --git a/inventory/host_vars/jitsi b/inventory/host_vars/jitsi
deleted file mode 100644
index 886c099..0000000
--- a/inventory/host_vars/jitsi
+++ /dev/null
@@ -1,4 +0,0 @@
-basics_autoupdate_origins:
-  - "o=jitsi.org,n=stable"
-  - "o=Node Source,n=${distro_codename}"
-nginx_worker_connections: 1024
diff --git a/inventory/host_vars/speicher b/inventory/host_vars/speicher.yml
similarity index 100%
rename from inventory/host_vars/speicher
rename to inventory/host_vars/speicher.yml
diff --git a/inventory/host_vars/srv01 b/inventory/host_vars/srv01.yml
similarity index 100%
rename from inventory/host_vars/srv01
rename to inventory/host_vars/srv01.yml
diff --git a/inventory/host_vars/srv02 b/inventory/host_vars/srv02.yml
similarity index 100%
rename from inventory/host_vars/srv02
rename to inventory/host_vars/srv02.yml
diff --git a/inventory/host_vars/srv03 b/inventory/host_vars/srv03.yml
similarity index 100%
rename from inventory/host_vars/srv03
rename to inventory/host_vars/srv03.yml