diff --git a/roles/ubuntu_base/tasks/base.yml b/roles/ubuntu_base/tasks/base.yml
index 7d65ccb..257352b 100644
--- a/roles/ubuntu_base/tasks/base.yml
+++ b/roles/ubuntu_base/tasks/base.yml
@@ -10,7 +10,6 @@
     - haveged
     - mosh
     - srvadmin-all # Dell OpenManage
-  tags: install-base-packages
 
 - name: Install necessary packages via pip
   pip:
@@ -19,4 +18,3 @@
     packages:
       - docker
       - docker-compose
-  tags: install-base-packages
diff --git a/roles/ubuntu_base/tasks/custom-apt-repos.yml b/roles/ubuntu_base/tasks/custom-apt-repos.yml
index e6e094e..26ff799 100644
--- a/roles/ubuntu_base/tasks/custom-apt-repos.yml
+++ b/roles/ubuntu_base/tasks/custom-apt-repos.yml
@@ -3,9 +3,8 @@
   apt_repository:
     repo: "deb https://linux.dell.com/repo/community/openmanage/10101/focal focal main"
     state: "present"
-  tags: setup-custom-apt
   
 - name: update apt cache
   apt: 
     update_cache: yes
-  tags: setup-custom-apt
\ No newline at end of file
+ 
\ No newline at end of file
diff --git a/roles/ubuntu_base/tasks/main.yml b/roles/ubuntu_base/tasks/main.yml
index af771a8..d6d34a4 100644
--- a/roles/ubuntu_base/tasks/main.yml
+++ b/roles/ubuntu_base/tasks/main.yml
@@ -1,6 +1,10 @@
 ---
 - import_tasks: custom-apt-repos.yml
+  tags: [setup-custom-apt]
 - import_tasks: upgrade.yml
+  tags: [do-full-system-upgrade]
 - import_tasks: base.yml
+  tags: [install-base-packages]
 - import_tasks: users.yml
+  tags: [setup-users]
 
diff --git a/roles/ubuntu_base/tasks/upgrade.yml b/roles/ubuntu_base/tasks/upgrade.yml
index 73d6ec5..c4cd33b 100644
--- a/roles/ubuntu_base/tasks/upgrade.yml
+++ b/roles/ubuntu_base/tasks/upgrade.yml
@@ -3,4 +3,3 @@
   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 2ce0a9d..4e9954c 100644
--- a/roles/ubuntu_base/tasks/users.yml
+++ b/roles/ubuntu_base/tasks/users.yml
@@ -7,7 +7,6 @@
     update_password: "on_create"
     groups:  "{{ item.groups }}"
   loop: "{{ users | default([]) }}"
-  tags: "setup-users"
 
 - name: "Add ssh authorized_keys"
   authorized_key:
@@ -16,7 +15,6 @@
   with_subelements:
   - "{{ users | default([]) }}"
   - keys
-  tags: "setup-users"
 
 - name: "Add ssh authorized_keys to root user"
   authorized_key:
@@ -25,4 +23,3 @@
   with_subelements:
   - "{{ users | default([]) }}"
   - keys
-  tags: "setup-users"