diff --git a/Ansible/roles/debian_server/tasks/main.yml b/Ansible/roles/debian_server/tasks/main.yml
index 5ad3c2ac37bb4447183c932bf9230d78cf28336b..e227a3eab34c75a5bd7f22cd70301674656ef017 100644
--- a/Ansible/roles/debian_server/tasks/main.yml
+++ b/Ansible/roles/debian_server/tasks/main.yml
@@ -134,7 +134,11 @@
     - always
 
 - name: Include  Toolbox tasks
-  ansible.builtin.import_tasks:
+  ansible.builtin.include_tasks:
     file: toolbox.yml
+    apply:
+      tags:
+        - toolbox
+        - toolbx
   tags:
     - always
diff --git a/Ansible/roles/debian_server/tasks/toolbox.yml b/Ansible/roles/debian_server/tasks/toolbox.yml
index 0133d2b0f934e98036f2c7ae518adb5e07442a22..67419f345e75065c7897c60c93c32feaf6531029 100644
--- a/Ansible/roles/debian_server/tasks/toolbox.yml
+++ b/Ansible/roles/debian_server/tasks/toolbox.yml
@@ -20,7 +20,8 @@
     value: "1"
 
 - name: Install Podman from the Kubic repository
-  when: toolbox_podman_repo_base_url is defined
+  # yamllint disable-line rule:line-length
+  when: ansible_facts.distribution_release in toolbox_podman_repo_base_url_mapping
   block:
     - name: Add the Podman repo key
       apt_key:
@@ -55,7 +56,7 @@
 
 - name: Install Toolbx from toolbox-build
   # yamllint disable-line rule:line-length
-  when: ansible_facts.distribution_release is not in toolbox_distros_with_apt_package
+  when: ansible_facts.distribution_release is in toolbox_distros_without_apt_package
   unarchive:
     dest: /usr/local/
     remote_src: true
@@ -64,7 +65,7 @@
 
 - name: APT install Toolbx
   # yamllint disable-line rule:line-length
-  when: ansible_facts.distribution_release is in toolbox_distros_with_apt_package
+  when: ansible_facts.distribution_release is not in toolbox_distros_without_apt_package
   apt:
     cache_valid_time: 3600
     name: