diff --git a/linux-config-relayhost-smtp.yaml b/linux-config-relayhost-smtp.yaml
index 7fd6244..d6889a8 100644
--- a/linux-config-relayhost-smtp.yaml
+++ b/linux-config-relayhost-smtp.yaml
@@ -14,4 +14,5 @@
 
     - name: "[CONFIG RELAYHOST SMTP] Config relayhost smtp"
       import_role:
-        name: config-relayhost-smtp
\ No newline at end of file
+        name: config-relayhost-smtp
+      when: relay-host_enabled is defined and relay-host_enabled
\ No newline at end of file
diff --git a/linux-config-repo-vn.yaml b/linux-config-repo-vn.yaml
index 57b40d5..f8a6e4f 100644
--- a/linux-config-repo-vn.yaml
+++ b/linux-config-repo-vn.yaml
@@ -15,3 +15,4 @@
     - name: "[CONFIG REPO VN] Add-repos-vn"
       import_role:
         name: config-repo-vn
+      when: repo-vn_enabled is defined and repo-vn_enabled
diff --git a/linux-config-secure-grub.yaml b/linux-config-secure-grub.yaml
index f37bd2d..5151528 100644
--- a/linux-config-secure-grub.yaml
+++ b/linux-config-secure-grub.yaml
@@ -15,3 +15,4 @@
     - name: "[CONFIG SECURE GRUB] configure secure grub"
       import_role:
         name: config-secure-grub
+      when: secure-grub_enabled is defined and secure-grub_enabled
diff --git a/linux-config-server-type.yaml b/linux-config-server-type.yaml
index cfe57cd..b51b63e 100644
--- a/linux-config-server-type.yaml
+++ b/linux-config-server-type.yaml
@@ -15,3 +15,4 @@
     - name: "[CONFIG SERVER TYPE] Install guest side"
       import_role:
         name: config-server-type
+      when: server-type_enabled is defined and server-type_enabled
diff --git a/linux-config-sudoers.yaml b/linux-config-sudoers.yaml
index daa0474..dbc1a7f 100644
--- a/linux-config-sudoers.yaml
+++ b/linux-config-sudoers.yaml
@@ -14,4 +14,5 @@
 
     - name: "[CONFIG SUDOERS] Config sudoers"
       import_role:
-        name: config-sudoers
\ No newline at end of file
+        name: config-sudoers
+      when: sudoers_enabled is defined and sudoers_enabled
\ No newline at end of file
diff --git a/linux-config-tzdata.yaml b/linux-config-tzdata.yaml
index 4ef684f..2b5b49f 100644
--- a/linux-config-tzdata.yaml
+++ b/linux-config-tzdata.yaml
@@ -14,4 +14,5 @@
 
     - name: "[CONFIG TZDATA] Set timezone"
       import_role:
-        name: config-tzdata
\ No newline at end of file
+        name: config-tzdata
+      when: tzdata_enabled is defined and tzdata_enabled
\ No newline at end of file
diff --git a/linux-config-update-and-upgrade-packages.yaml b/linux-config-update-and-upgrade-packages.yaml
index 24ddeea..69adfce 100644
--- a/linux-config-update-and-upgrade-packages.yaml
+++ b/linux-config-update-and-upgrade-packages.yaml
@@ -14,4 +14,5 @@
 
     - name: "[CONFIG UPDATE] Config update"
       import_role:
-        name: config-update-and-upgrade-packages
\ No newline at end of file
+        name: config-update-and-upgrade-packages
+      when: update_enabled is defined and update_enabled
\ No newline at end of file
diff --git a/linux-config-vim-options.yaml b/linux-config-vim-options.yaml
index 6884f94..a2e0e3e 100644
--- a/linux-config-vim-options.yaml
+++ b/linux-config-vim-options.yaml
@@ -14,4 +14,5 @@
 
     - name: "[CONFIG VIM OPTIONS] Config vim options"
       import_role:
-        name: config-vim-options
\ No newline at end of file
+        name: config-vim-options
+      when: vim-options_enabled is defined and vim-options_enabled
\ No newline at end of file
diff --git a/linux-config-zabbix-agent.yaml b/linux-config-zabbix-agent.yaml
index 8d9b6fc..9e8ac81 100644
--- a/linux-config-zabbix-agent.yaml
+++ b/linux-config-zabbix-agent.yaml
@@ -14,4 +14,5 @@
 
     - name: "[CONFIG ZABBIX AGENT] Install and configure ZABBIX AGENT"
       import_role:
-        name: config-zabbix-agent
\ No newline at end of file
+        name: config-zabbix-agent
+      when: zabbix-agent_enabled is defined and zabbix-agent_enabled
\ No newline at end of file