diff --git a/salt/common.sls b/salt/common.sls
deleted file mode 100644
index d0d4de2..0000000
--- a/salt/common.sls
+++ /dev/null
@@ -1,3 +0,0 @@
-include:
-  - role.minion
-  - role.common-suse
diff --git a/salt/common/init.sls b/salt/common/init.sls
new file mode 100644
index 0000000..7fbb4f4
--- /dev/null
+++ b/salt/common/init.sls
@@ -0,0 +1,3 @@
+include:
+  - role.minion
+  - common.{{ grains['os'] | lower }}
diff --git a/salt/role/common-suse.sls b/salt/common/suse.sls
similarity index 100%
rename from salt/role/common-suse.sls
rename to salt/common/suse.sls