diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index bec3d5d..883c231 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -4,6 +4,7 @@
 ###   users
 ###   install
 ###   config
+###   update_etc_hosts
 ###   root_authorized_keys
 
 - name: "Set hostname to <{{ inventory_hostname }}>"
@@ -20,6 +21,8 @@
       {% for host in shared_service_hosts %}
       {{ host.ip }} {{ host.name }}
       {% endfor %}
+  tags:
+    - update_etc_hosts
 
 - name: "Adding authorized keys for root"
   ansible.posix.authorized_key:
@@ -89,6 +92,7 @@
   when: docker_enabled
   tags:
     - users
+    - config
 
 - name: "Insert/Update docker configuration"
   template: