diff --git a/roles/ubuntu_base/tasks/base.yml b/roles/ubuntu_base/tasks/base.yml
index 6202009..7d65ccb 100644
--- a/roles/ubuntu_base/tasks/base.yml
+++ b/roles/ubuntu_base/tasks/base.yml
@@ -19,3 +19,4 @@
     packages:
       - docker
       - docker-compose
+  tags: install-base-packages
diff --git a/roles/ubuntu_base/tasks/upgrade.yml b/roles/ubuntu_base/tasks/upgrade.yml
index c4cd33b..73d6ec5 100644
--- a/roles/ubuntu_base/tasks/upgrade.yml
+++ b/roles/ubuntu_base/tasks/upgrade.yml
@@ -3,3 +3,4 @@
   apt: 
     update_cache: yes
     upgrade: full
+  tags: "do-full-system-upgrade"
diff --git a/roles/ubuntu_base/tasks/users.yml b/roles/ubuntu_base/tasks/users.yml
index 4e9954c..2ce0a9d 100644
--- a/roles/ubuntu_base/tasks/users.yml
+++ b/roles/ubuntu_base/tasks/users.yml
@@ -7,6 +7,7 @@
     update_password: "on_create"
     groups:  "{{ item.groups }}"
   loop: "{{ users | default([]) }}"
+  tags: "setup-users"
 
 - name: "Add ssh authorized_keys"
   authorized_key:
@@ -15,6 +16,7 @@
   with_subelements:
   - "{{ users | default([]) }}"
   - keys
+  tags: "setup-users"
 
 - name: "Add ssh authorized_keys to root user"
   authorized_key:
@@ -23,3 +25,4 @@
   with_subelements:
   - "{{ users | default([]) }}"
   - keys
+  tags: "setup-users"