diff --git a/cluster.yml b/cluster.yml
index 3d430aa0a..3724554aa 100644
--- a/cluster.yml
+++ b/cluster.yml
@@ -6,7 +6,7 @@
 
 - hosts: k8s-cluster
   roles:
-    - { role: common, tags: common }
+    - { role: kubernetes/preinstall, tags: preinstall }
     - { role: docker, tags: docker }
     - { role: kubernetes/node, tags: node }
     - { role: etcd, tags: etcd }
diff --git a/roles/common/defaults/main.yml b/roles/kubernetes/preinstall/defaults/main.yml
similarity index 100%
rename from roles/common/defaults/main.yml
rename to roles/kubernetes/preinstall/defaults/main.yml
diff --git a/roles/common/files/bootstrap.sh b/roles/kubernetes/preinstall/files/bootstrap.sh
similarity index 100%
rename from roles/common/files/bootstrap.sh
rename to roles/kubernetes/preinstall/files/bootstrap.sh
diff --git a/roles/common/files/get-pip.py b/roles/kubernetes/preinstall/files/get-pip.py
similarity index 100%
rename from roles/common/files/get-pip.py
rename to roles/kubernetes/preinstall/files/get-pip.py
diff --git a/roles/common/files/runner b/roles/kubernetes/preinstall/files/runner
similarity index 100%
rename from roles/common/files/runner
rename to roles/kubernetes/preinstall/files/runner
diff --git a/roles/common/tasks/download.yml b/roles/kubernetes/preinstall/tasks/download.yml
similarity index 100%
rename from roles/common/tasks/download.yml
rename to roles/kubernetes/preinstall/tasks/download.yml
diff --git a/roles/common/tasks/main.yml b/roles/kubernetes/preinstall/tasks/main.yml
similarity index 100%
rename from roles/common/tasks/main.yml
rename to roles/kubernetes/preinstall/tasks/main.yml
diff --git a/roles/common/tasks/python-bootstrap.yml b/roles/kubernetes/preinstall/tasks/python-bootstrap.yml
similarity index 100%
rename from roles/common/tasks/python-bootstrap.yml
rename to roles/kubernetes/preinstall/tasks/python-bootstrap.yml