diff --git a/contrib/ansible/cluster.yml b/contrib/ansible/cluster.yml
index dc67ebc4352..a5b3532fd81 100644
--- a/contrib/ansible/cluster.yml
+++ b/contrib/ansible/cluster.yml
@@ -11,7 +11,6 @@
 - hosts: etcd
   sudo: yes
   roles:
-    - common
     - etcd
   tags:
     - etcd
@@ -31,8 +30,6 @@
 - hosts: masters
   sudo: yes
   roles:
-    - common
-    - kubernetes
     - master
   tags:
     - masters
@@ -50,8 +47,6 @@
 - hosts: nodes
   sudo: yes
   roles:
-    - common
-    - kubernetes
     - node
   tags:
     - nodes
diff --git a/contrib/ansible/roles/etcd/meta/main.yml b/contrib/ansible/roles/etcd/meta/main.yml
new file mode 100644
index 00000000000..0764e314824
--- /dev/null
+++ b/contrib/ansible/roles/etcd/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+    - { role: common }
diff --git a/contrib/ansible/roles/node/meta/main.yml b/contrib/ansible/roles/node/meta/main.yml
index be654b3de8a..e05b1275fc2 100644
--- a/contrib/ansible/roles/node/meta/main.yml
+++ b/contrib/ansible/roles/node/meta/main.yml
@@ -1,4 +1,5 @@
 ---
 dependencies:
+    - { role: common }
     - { role: docker }
     - { role: kubernetes }