diff --git a/bibigrid/resources/playbook/roles/bibigrid/tasks/003-dns.yaml b/bibigrid/resources/playbook/roles/bibigrid/tasks/003-dns.yaml
index 1bb3994a..4dbfc13a 100644
--- a/bibigrid/resources/playbook/roles/bibigrid/tasks/003-dns.yaml
+++ b/bibigrid/resources/playbook/roles/bibigrid/tasks/003-dns.yaml
@@ -2,6 +2,8 @@
   apt:
     name: dnsmasq
     state: present
+  tags:
+    - "image"
 
 - name: Disable and Stop systemd-resolve
   systemd:
diff --git a/bibigrid/resources/playbook/roles/bibigrid/tasks/006-database.yaml b/bibigrid/resources/playbook/roles/bibigrid/tasks/006-database.yaml
index 2ba2a358..d68465fe 100644
--- a/bibigrid/resources/playbook/roles/bibigrid/tasks/006-database.yaml
+++ b/bibigrid/resources/playbook/roles/bibigrid/tasks/006-database.yaml
@@ -3,3 +3,5 @@
     name:
       - mariadb-server
       - python3-pymysql
+  tags:
+    - "image"
\ No newline at end of file
diff --git a/bibigrid/resources/playbook/roles/bibigrid/tasks/011-zabbix-agent.yaml b/bibigrid/resources/playbook/roles/bibigrid/tasks/011-zabbix-agent.yaml
index 24a8bf27..d60b90f8 100644
--- a/bibigrid/resources/playbook/roles/bibigrid/tasks/011-zabbix-agent.yaml
+++ b/bibigrid/resources/playbook/roles/bibigrid/tasks/011-zabbix-agent.yaml
@@ -38,12 +38,16 @@
   apt:
     name: zabbix-agent2
     state: present
+  tags:
+    - "image"
   when: "ansible_distribution_file_variety == 'Debian'"
 
 - name: Install zabbix agent
   dnf:
     name: zabbix-agent
     state: present
+  tags:
+    - "image"
   when: "ansible_distribution_file_variety == 'RedHat'"
 
 - name: Start and Enable zabbix-agent2
diff --git a/bibigrid/resources/playbook/roles/bibigrid/tasks/011-zabbix-server.yaml b/bibigrid/resources/playbook/roles/bibigrid/tasks/011-zabbix-server.yaml
index aad585db..a101292e 100644
--- a/bibigrid/resources/playbook/roles/bibigrid/tasks/011-zabbix-server.yaml
+++ b/bibigrid/resources/playbook/roles/bibigrid/tasks/011-zabbix-server.yaml
@@ -15,6 +15,8 @@
       - python3-pymysql
     state: present
     update_cache: true
+  tags:
+    - "image"
   when: "ansible_distribution_file_variety == 'Debian' or ansible_distribution == 'Ubuntu'"
 
 - name: REHL based OS (Install database & Zabbix server)
@@ -25,6 +27,8 @@
       - zabbix-sql-scripts
       - python3-pymysql
     state: present
+  tags:
+    - "image"
   when: "ansible_distribution_file_variety == 'RedHat' "
 
 - name: Create zabbix database
@@ -100,6 +104,8 @@
           - zabbix-frontend-php
           - zabbix-apache-conf
         state: present
+  tags:
+    - "image"
 
 - name: Zabbix Web Frontend related packages for REHL based OS
   when: "ansible_distribution_file_variety == 'RedHat'"
@@ -115,6 +121,8 @@
           - zabbix-frontend-php
           - zabbix-apache-conf
         state: present
+  tags:
+    - "image"
 
 - name: Create Zabbix web dir (if not exists)
   file:
diff --git a/bibigrid/resources/playbook/roles/bibigrid/tasks/025-nfs-server.yaml b/bibigrid/resources/playbook/roles/bibigrid/tasks/025-nfs-server.yaml
index bf67842f..e9b7b83c 100644
--- a/bibigrid/resources/playbook/roles/bibigrid/tasks/025-nfs-server.yaml
+++ b/bibigrid/resources/playbook/roles/bibigrid/tasks/025-nfs-server.yaml
@@ -2,6 +2,8 @@
   apt:
     name: "nfs-kernel-server"
     state: present
+  tags:
+    - "image"
 
 - name: Create shared directories
   file:
diff --git a/bibigrid/resources/playbook/roles/bibigrid/tasks/025-nfs-worker.yaml b/bibigrid/resources/playbook/roles/bibigrid/tasks/025-nfs-worker.yaml
index e18f89d1..f907c4f8 100644
--- a/bibigrid/resources/playbook/roles/bibigrid/tasks/025-nfs-worker.yaml
+++ b/bibigrid/resources/playbook/roles/bibigrid/tasks/025-nfs-worker.yaml
@@ -2,6 +2,8 @@
   apt:
     name: "nfs-common"
     state: present
+  tags:
+    - "image"
 
 - name: Wait for nfs-server available
   wait_for:
diff --git a/bibigrid/resources/playbook/roles/bibigrid/tasks/030-docker.yaml b/bibigrid/resources/playbook/roles/bibigrid/tasks/030-docker.yaml
index 653fc29d..9cdbbc52 100644
--- a/bibigrid/resources/playbook/roles/bibigrid/tasks/030-docker.yaml
+++ b/bibigrid/resources/playbook/roles/bibigrid/tasks/030-docker.yaml
@@ -3,6 +3,8 @@
     url: https://download.docker.com/linux/ubuntu/gpg
     keyring: /etc/apt/keyrings/docker.gpg
     state: present
+  tags:
+    - "image"
 
 
 - name: Add Docker repository
@@ -16,6 +18,8 @@
   vars:
     arch_mapping:
       x86_64: amd64
+  tags:
+    - "image"
 
 - name: Install Docker
   apt:
@@ -25,7 +29,9 @@
       - docker-compose
       - docker-compose-plugin
     state: present
-  tags: install
+  tags:
+    - "install"
+    - "image"
 
 - name: Configure Docker
   copy:
diff --git a/bibigrid/resources/playbook/roles/bibigrid/tasks/042-slurm.yaml b/bibigrid/resources/playbook/roles/bibigrid/tasks/042-slurm.yaml
index a5334c03..53675364 100644
--- a/bibigrid/resources/playbook/roles/bibigrid/tasks/042-slurm.yaml
+++ b/bibigrid/resources/playbook/roles/bibigrid/tasks/042-slurm.yaml
@@ -22,11 +22,15 @@
   apt:
     name: slurm-bibigrid-24.11
     state: present
+  tags:
+    - "image"
 
 - name: Install Slurm package dependencies
   apt:
     name:
       - munge
+  tags:
+    - "image"
 
 - name: Create new secret (Munge)
   copy:
diff --git a/bibigrid/resources/playbook/roles/bibigrid/tasks/900-theia.yaml b/bibigrid/resources/playbook/roles/bibigrid/tasks/900-theia.yaml
index 620f40bc..d76a1256 100644
--- a/bibigrid/resources/playbook/roles/bibigrid/tasks/900-theia.yaml
+++ b/bibigrid/resources/playbook/roles/bibigrid/tasks/900-theia.yaml
@@ -2,6 +2,8 @@
   apt:
     name: ["python3", "make", "g++", "curl", "git", "pkg-config", "libsecret-1-dev"]
   when: ansible_distribution_file_variety == 'Debian'
+  tags:
+    - "image"
 
 - name: Install packages
   yum:
diff --git a/bibigrid/resources/playbook/roles/bibigrid/tasks/main.yaml b/bibigrid/resources/playbook/roles/bibigrid/tasks/main.yaml
index 3b10ce5a..1b7e8292 100644
--- a/bibigrid/resources/playbook/roles/bibigrid/tasks/main.yaml
+++ b/bibigrid/resources/playbook/roles/bibigrid/tasks/main.yaml
@@ -33,6 +33,7 @@
   when: "ansible_distribution_file_variety == 'Debian'"
   tags:
     - "pkg"
+    - "image"
   block:
     - name: Running 001-apt.yaml
       debug: