diff --git a/ansible/roles/netauth-config/tasks/main.yml b/ansible/roles/netauth-config/tasks/main.yml
index c5857f3b..a25cdcf4 100644
--- a/ansible/roles/netauth-config/tasks/main.yml
+++ b/ansible/roles/netauth-config/tasks/main.yml
@@ -6,6 +6,7 @@
     owner: root
     group: root
     mode: 0755
+  tags: [install_netauth_conf]
 
 - name: Configure NetAuth library
   copy:
@@ -14,6 +15,7 @@
     owner: root
     group: root
     mode: 0644
+  tags: [install_netauth_conf]
 
 - name: Ensure key directory
   file:
@@ -22,6 +24,7 @@
     owner: root
     group: root
     mode: 0755
+  tags: [install_netauth_conf]
 
 - name: Install NetAuth Certificate
   copy:
@@ -30,6 +33,7 @@
     owner: root
     group: root
     mode: 0644
+  tags: [install_netauth_conf, configure_netauth_conf]
 
 - name: Install Token Verification Key
   copy:
@@ -38,6 +42,7 @@
     owner: root
     group: root
     mode: 0644
+  tags: [install_netauth_conf, configure_netauth_conf]
 
 - name: Install Firewall Rules
   copy:
@@ -48,3 +53,4 @@
     mode: 0644
   notify:
     - iptables
+  tags: [install_netauth_conf]
diff --git a/ansible/roles/netauthd/tasks/main.yml b/ansible/roles/netauthd/tasks/main.yml
index d0dcf2a4..5d1516d2 100644
--- a/ansible/roles/netauthd/tasks/main.yml
+++ b/ansible/roles/netauthd/tasks/main.yml
@@ -16,6 +16,7 @@
   no_log: true
   notify:
     - netauthd
+  tags: [install_netauthd, configure_netauthd]
 
 - name: Install Token Keys
   copy:
@@ -27,6 +28,7 @@
   no_log: true
   notify:
     - netauthd
+  tags: [install_netauthd, configure_netauthd]
 
 - name: Install Firewall Rules
   copy: