diff --git a/contrib/ansible/cluster.yml b/contrib/ansible/cluster.yml
index 68f7e6a44e6..984c4b090ec 100644
--- a/contrib/ansible/cluster.yml
+++ b/contrib/ansible/cluster.yml
@@ -1,4 +1,29 @@
-# Set up a whole working cluster!
-- include: etcd.yml
-- include: kubernetes-services.yml
+---
+# Install etcd
+- hosts: etcd
+  sudo: yes
+  roles:
+        - common
+        - etcd
+  tags:
+        - etcd
 
+# install kube master services
+- hosts: masters
+  sudo: yes
+  roles:
+        - common
+        - kubernetes
+        - master
+  tags:
+        - masters
+
+# install kubernetes on the nodes
+- hosts: minions
+  sudo: yes
+  roles:
+        - common
+        - kubernetes
+        - minion
+  tags:
+        - minions
diff --git a/contrib/ansible/etcd.yml b/contrib/ansible/etcd.yml
deleted file mode 100644
index 4a4540a889d..00000000000
--- a/contrib/ansible/etcd.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- hosts: etcd
-  sudo: yes
-  roles:
-          - common
-          - etcd
diff --git a/contrib/ansible/kubernetes-services.yml b/contrib/ansible/kubernetes-services.yml
deleted file mode 100644
index a5e53974f43..00000000000
--- a/contrib/ansible/kubernetes-services.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- hosts: masters:minions
-  sudo: yes
-  roles:
-          - common
-
-- hosts: masters
-  sudo: yes
-  roles:
-          - kubernetes
-          - master
-
-- hosts: minions
-  sudo: yes
-  roles:
-          - kubernetes
-          - minion