diff --git a/README.md b/README.md
index da355117c17da662c766e84c748724ba379e3b1b..ef08322024bf9b4c5f1d3a7c0bc26782bad9ffc8 100644
--- a/README.md
+++ b/README.md
@@ -50,8 +50,8 @@ The main variables to change are located in the directory ```environments/[env_n
 - hosts: kube-master
   roles:
     - { role: kubernetes/master, tags: master }
-    - { role: k8s-skydns, tags: skydns }
-    - { role: k8s-kube-ui, tags: kube-ui }
+    - { role: apps/k8s-skydns, tags: skydns }
+    - { role: apps/k8s-kube-ui, tags: kube-ui }
 
 - hosts: kube-node
   roles:
@@ -122,7 +122,7 @@ grep path .gitmodules | sed 's/.*= //'
 For instance if you will probably want to install a [dns server](https://github.com/kubernetes/kubernetes/tree/master/cluster/addons/dns) as it is **strongly recommanded**.
 In order to use this role you'll need to follow these steps
 ```
-git submodule init roles/apps/k8s-skydns
+git submodule init roles/apps/k8s-common roles/apps/k8s-skydns
 git submodule update
 ```
 Then update your playbook with the chosen role
diff --git a/cluster.yml b/cluster.yml
index 273e15aeccd93841a458aa4271848714e9debfa6..5656422d891120ae7bbaff0cf299f7a8c9b001d0 100644
--- a/cluster.yml
+++ b/cluster.yml
@@ -15,8 +15,8 @@
   roles:
     - { role: kubernetes/master, tags: master }
     # Addons to be installed
-    # - { role: k8s-kube-ui, tags: kube-ui }
-    # - { role: k8s-skydns, tags: skydns }
+    # - { role: apps/k8s-kube-ui, tags: kube-ui }
+    # - { role: apps/k8s-skydns, tags: skydns }
 
 - hosts: kube-node
   roles:
diff --git a/roles/apps/k8s-kube-ui b/roles/apps/k8s-kube-ui
index 40e56462f5860d8d63cc9b6a0ded0519f7659010..766ceeab47bb9122a11d066b0e95960a2ddc6fc1 160000
--- a/roles/apps/k8s-kube-ui
+++ b/roles/apps/k8s-kube-ui
@@ -1 +1 @@
-Subproject commit 40e56462f5860d8d63cc9b6a0ded0519f7659010
+Subproject commit 766ceeab47bb9122a11d066b0e95960a2ddc6fc1