diff --git a/roles/apps/tasks/bitcoin.yml b/roles/apps/tasks/bitcoin.yml
index e02ad23..3a60802 100644
--- a/roles/apps/tasks/bitcoin.yml
+++ b/roles/apps/tasks/bitcoin.yml
@@ -44,6 +44,7 @@
       bitcoin_rpcpassword: "{{ rpcauth_json.password }}"
       bitcoin_rpcauth: "{{ rpcauth_json.rpcauth}}"
   when: ((bitcoin_rpcuser is defined) and (bitcoin_rpcuser|length==0)) or ((bitcoin_rpcpassword is defined) and (bitcoin_rpcpassword|length==0)) or ((bitcoin_rpcauth is defined) and (bitcoin_rpcauth|length==0))
+  tags: [apps,bitcoin]
 
 - name: bitcoin - Create bitcoin-pod
   containers.podman.podman_pod:
@@ -56,17 +57,20 @@
       - "8333:8333"
       - "9735:9735"
       - "3010:3010"
+  tags: [apps,bitcoin]
 
 - name: bitcoin - Create bitcoin data / conf directory
   ansible.builtin.file:
     path: ~/.bitcoin
     state: directory
     mode: '0755'
+  tags: [apps,bitcoin]
 
 - name: bitcoin - Create .config/containers/systemd directory
   ansible.builtin.file:
     path: ~/config/containers/systemd
     state: directory
+  tags: [apps,bitcoin]
 
 - name: bitcoin - Copy bitcoin-node.container file
   ansible.builtin.template:
@@ -75,6 +79,7 @@
   notify: 
     - reload_systemctl
     - restart_bitcoin
+  tags: [apps,bitcoin]
 
 - name: bitcoin - Create Containers/bitcoin Dir
   ansible.builtin.file:
@@ -82,30 +87,35 @@
     recurse: true
     state: directory
   notify: rebuild_bitcoin
+  tags: [apps,bitcoin]
 
 - name: bitcoin - Copy Containerfile Template
   ansible.builtin.copy:
     src: bitcoin/Containerfile
     dest: ~/Containers/bitcoin/Containerfile
   notify: rebuild_bitcoin
+  tags: [apps,bitcoin]
 
 - name: bitcoin - Copy entrypoint.sh
   ansible.builtin.copy:
     src: bitcoin/entrypoint.sh
     dest: ~/Containers/bitcoin/entrypoint.sh
   notify: rebuild_bitcoin
+  tags: [apps,bitcoin]
 
 - name: bitcoin - Copy btc_init
   ansible.builtin.copy:
     src: bitcoin/bin/btc_init
     dest: ~/Containers/bitcoin/bin/btc_init
   notify: rebuild_bitcoin
+  tags: [apps,bitcoin]
 
 - name: bitcoin - Copy btc_oneshot
   ansible.builtin.template:
     src: bitcoin/bin/btc_oneshot.j2
     dest: ~/Containers/bitcoin/bin/btc_oneshot
   notify: rebuild_bitcoin
+  tags: [apps,bitcoin]
   
 - name: bitcoin - Copy build script
   ansible.builtin.template:
@@ -113,9 +123,11 @@
     dest: ~/Containers/bitcoin/build.sh
     mode: '0700'
   notify: rebuild_bitcoin
+  tags: [apps,bitcoin]
 
 - name: bitcoin - copy rpcauth.py utility
   ansible.builtin.copy:
     src: bitcoin/rpcauth.py
     dest: ~/Containers/bitcoin/rpcauth.py
     mode: '0700'
+  tags: [apps,bitcoin]
diff --git a/roles/apps/tasks/clightning.yml b/roles/apps/tasks/clightning.yml
index 2bcaf99..0c3e9f3 100644
--- a/roles/apps/tasks/clightning.yml
+++ b/roles/apps/tasks/clightning.yml
@@ -5,12 +5,14 @@
   ansible.builtin.file:
     path: ~/.clightning
     state: directory
+  tags: [apps,clightning]
 
 - name: clightning - Copy clightning-node.container file
   ansible.builtin.template:
     src: clightning/clightning-node.container.j2
     dest: /home/{{ ansible_user }}/.config/containers/systemd/clightning-node.container
   notify: reload_systemctl
+  tags: [apps,clightning]
 
 - name: clightning - Create Containers/bitcoin Dir
   ansible.builtin.file:
@@ -18,17 +20,20 @@
     recurse: true
     state: directory
   notify: rebuild_clightning
+  tags: [apps,clightning]
 
 - name: clightning - Copy Containerfile Template
   ansible.builtin.template:
     src: clightning/Containerfile.j2
     dest: ~/Containers/clightning/Containerfile
   notify: rebuild_clightning
+  tags: [apps,clightning]
 
 - name: clightning - Copy entrypoint.sh
   ansible.builtin.copy:
     src: clightning/entrypoint.sh
     dest: ~/Containers/clightning/entrypoint.sh
+  tags: [apps,clightning]
 
 - name: clightning - Copy build script
   ansible.builtin.template:
@@ -36,5 +41,6 @@
     dest: ~/Containers/clightning/build.sh
     mode: '0700'
   notify: rebuild_clightning
+  tags: [apps,clightning]
 
 
diff --git a/roles/apps/tasks/docs.yml b/roles/apps/tasks/docs.yml
index eaab605..b83d0bb 100644
--- a/roles/apps/tasks/docs.yml
+++ b/roles/apps/tasks/docs.yml
@@ -6,16 +6,19 @@
   ansible.builtin.file:
     path: ~/srv/docs/
     state: directory
+  tags: [apps,docs]
 
 - name: docs - Create ~/srv/docs/sites
   ansible.builtin.file:
     path: ~/srv/docs/site
     state: directory
+  tags: [apps,docs]
 
 - name: docs - Create ~/srv/docs/docs
   ansible.builtin.file:
     path: ~/srv/docs/docs
     state: directory
+  tags: [apps,docs]
 
 - name: docs - Copy documentation 
   ansible.builtin.copy:
@@ -24,17 +27,20 @@
   with_fileglob:
     - "docs/docs/*"
   notify: republish_docs
+  tags: [apps,docs]
 
 - name: docs - Make dir for docs Containers
   ansible.builtin.file:
     path: ~/Containers/docs
     state: directory
+  tags: [apps,docs]
 
 - name: docs - Copy Containerfile Template
   ansible.builtin.copy:
     src: docs/Containerfile
     dest: ~/Containers/docs/Containerfile
   notify: rebuild_docs
+  tags: [apps,docs]
 
 - name: docs - Copy build script
   ansible.builtin.copy:
@@ -42,21 +48,25 @@
     dest: ~/Containers/docs/build.sh
     mode: '0700'
   notify: rebuild_docs
+  tags: [apps,docs]
 
 - name: docs - Copy requirements.txt file
   ansible.builtin.copy:
     src: docs/requirements.txt
     dest: ~/Containers/docs/requirements.txt
   notify: rebuild_docs
+  tags: [apps,docs]
 
 - name: docs - Copy mkdocs.yml file
   ansible.builtin.copy:
     src: docs/mkdocs.yml
     dest: ~/srv/docs/mkdocs.yml
   notify: rebuild_docs
+  tags: [apps,docs]
 
 - name: docs - Copy docs-node.container file
   ansible.builtin.template:
     src: docs/docs-node.container.j2
     dest: /home/{{ ansible_user }}/.config/containers/systemd/docs-node.container
   notify: reload_systemctl
+  tags: [apps,docs]
diff --git a/roles/apps/tasks/electrs.yml b/roles/apps/tasks/electrs.yml
index 463d398..1fd2767 100644
--- a/roles/apps/tasks/electrs.yml
+++ b/roles/apps/tasks/electrs.yml
@@ -5,12 +5,14 @@
   ansible.builtin.file:
     path: ~/.electrs
     state: directory
+  tags: [apps,electrs]
 
 - name: electrs - Copy electrs-node.container file
   ansible.builtin.template:
     src: electrs/electrs-node.container.j2
     dest: /home/{{ ansible_user }}/.config/containers/systemd/electrs-node.container
   notify: reload_systemctl
+  tags: [apps,electrs]
 
 - name: electrs - Create Containers/bitcoin Dir
   ansible.builtin.file:
@@ -18,17 +20,20 @@
     recurse: true
     state: directory
   notify: rebuild_electrs
+  tags: [apps,electrs]
 
 - name: electrs - Copy Containerfile Template
   ansible.builtin.template:
     src: electrs/Containerfile.j2
     dest: ~/Containers/electrs/Containerfile
   notify: rebuild_electrs
+  tags: [apps,electrs]
 
 - name: electrs - Copy electrs-init.sh
   ansible.builtin.template:
     src: electrs/electrs-init.sh.j2
     dest: ~/Containers/electrs/electrs-init.sh
+  tags: [apps,electrs]
 
 - name: electrs - Copy build script
   ansible.builtin.template:
@@ -36,5 +41,6 @@
     dest: ~/Containers/electrs/build.sh
     mode: '0700'
   notify: rebuild_electrs
+  tags: [apps,electrs]
 
 
diff --git a/roles/config/tasks/main.yml b/roles/config/tasks/main.yml
index 9214151..ffcd27e 100644
--- a/roles/config/tasks/main.yml
+++ b/roles/config/tasks/main.yml
@@ -12,6 +12,7 @@
   ansible.builtin.file:
     dest: /etc/sysusers.d
     state: directory
+  tags: config
 
 - name: Fix parsec bug in Fedora-39
   become: true
@@ -21,6 +22,7 @@
     dest: /etc/sysusers.d/parsec.conf
     setype: etc_t
   when: variant.stdout=="iot"
+  tags: config
 
 - name: Enable Cockpit Service
   become: true
@@ -29,6 +31,7 @@
     name: cockpit.socket
     state: started
     enabled: true
+  tags: config
 
 - name: Enable Cockpit in firewalld
   become: true
@@ -38,6 +41,7 @@
     permanent: true
     state: enabled
   when: variant.stdout=="iot"
+  tags: config
 
 - name: Enable Avahi Service
   become: true
@@ -46,6 +50,7 @@
     name: avahi-daemon
     state: started 
     enabled: true  
+  tags: config
                
 - name: Enable mdns in Firewall
   become: true
@@ -55,6 +60,7 @@
     permanent: true
     state: enabled
   when: variant.stdout=="iot"
+  tags: config
                
 - name: Modify nsswitch file for mdns lookups
   become: true
@@ -64,6 +70,7 @@
     regexp: '^hosts:'                                                     
     line: 'hosts:   files mdns4_minimal [NOTFOUND=return] dns myhostname'
   notify: restart_avahi
+  tags: config
 
 - name: Set hostname to {{ hostname }}
   become: true
@@ -71,6 +78,7 @@
   ansible.builtin.hostname:
     name: "{{ hostname }}"
   notify: restart_avahi
+  tags: config
 
 - name: Enable Zerotier
   become: true
@@ -80,6 +88,7 @@
     state: started
     enabled: true
   when: (zerotier_network is defined) and (zerotier_network|length>0)
+  tags: config
 
 - name: Mask Fedora countme timer
   become: true
@@ -89,6 +98,7 @@
     state: stopped
     enabled: false
     masked: true
+  tags: config
 
 - name: Set {{ ansible_user }} user to linger
   become: true
@@ -96,6 +106,7 @@
   ansible.builtin.shell: 
     cmd: loginctl enable-linger {{ ansible_user }}
     creates: /var/lib/systemd/linger/{{ ansible_user }}
+  tags: config
 
 - name: Set update zincati wariness to {{update_wariness}}
   become: true
@@ -105,6 +116,7 @@
     content: |
       [identity]
       rollout_wariness = {{update_wariness}}
+  tags: config
 
 - name: Set update schedule for zincati
   become: true
@@ -122,5 +134,6 @@
       days = {{ update_schedule_days }}
       start_time = "{{ update_schedule_starttime }}"
       length_minutes = {{ update_schedule_length }}
+  tags: config
 
 
diff --git a/roles/install/tasks/main.yml b/roles/install/tasks/main.yml
index 916edb5..83bdb6b 100644
--- a/roles/install/tasks/main.yml
+++ b/roles/install/tasks/main.yml
@@ -8,9 +8,11 @@
   ansible.builtin.copy:
     src: RPM-GPG-KEY-zerotier
     dest: /etc/pki/rpm-gpg/RPM-GPG-KEY-zerotier
+  tags: [install,zerotier]
 
 - name: Refresh gpg keys
   shell: gpg --keyserver hkps://keys.openpgp.org --refresh-keys
+  tags: install
 
 - name: Copy Zerotier Repo
   become: yes
@@ -18,6 +20,7 @@
   ansible.builtin.template:
     src: zt.repo.j2
     dest: /etc/yum.repos.d/zt.repo
+  tags: [install,zerotier]
       
 - name: Install packages
   become: yes
@@ -42,6 +45,7 @@
       - python3-pip
       - smartmontools
       - caddy
+  tags: install
       
 - name: Reboot System
   become: yes
@@ -49,5 +53,6 @@
   ansible.builtin.reboot:
   ignore_errors: true
   when: reboot_status['changed']==True
+  tags: install