diff --git a/linux-base-config-debian-vm.yaml b/linux-base-config-debian-vm.yaml
index b1266bf..cf5fa01 100644
--- a/linux-base-config-debian-vm.yaml
+++ b/linux-base-config-debian-vm.yaml
@@ -15,7 +15,7 @@
     - name: "[CONFIG ROOT USER] Configure SSH root user"
       import_role:
         name: config-root-user
-      when: root-user_enabled is defined and root-user_enabled
+      when: root_user_enabled is defined and root_user_enabled
       tags: config-root-user_config
 
     - name: "[CONFIG HOSTNAME] Configure hostname"
@@ -51,13 +51,13 @@
     - name: "[CONFIG RELAYHOST SMTP] Config relayhost smtp"
       import_role:
         name: config-relayhost-smtp
-      when: relay-host_enabled is defined and relay-host_enabled
+      when: relay_host_enabled is defined and relay_host_enabled
       tags: config-relayhost-smtp_config
 
     - name: "[CONFIG CENTRALIZED AUTH] Config centralized auth"
       import_role:
         name: config-centralized-auth
-      when: centralized-auth_enabled is defined and centralized-auth_enabled
+      when: centralized_auth_enabled is defined and centralized_auth_enabled
       tags: config-centralized-auth_config
 
     - name: "[CONFIG SUDOERS] Config sudoers"
@@ -69,13 +69,13 @@
     - name: "[CONFIG SECURE GRUB] configure secure grub"
       import_role:
         name: config-secure-grub
-      when: secure-grub_enabled is defined and secure-grub_enabled
+      when: secure_grub_enabled is defined and secure_grub_enabled
       tags: config-secure-grub_config
 
     - name: "[CONFIG VIM OPTIONS] Config vim options"
       import_role:
         name: config-vim-options
-      when: vim-options_enabled is defined and vim-options_enabled
+      when: vim_options_enabled is defined and vim_options_enabled
       tags: config-vim-options_config
 
     - name: "[CONFIG MOTD] Config motd"
@@ -87,7 +87,7 @@
     - name: "[CONFIG HOT PLUG] Install and configure hot plug"
       import_role:
         name: config-hot-plug
-      when: hot-plug_enabled is defined and hot-plug_enabled
+      when: hot_plug_enabled is defined and hot_plug_enabled
       tags: config-hot-plug_config
 
     - name: "[CONFIG LOCALES] Set locales"
@@ -105,7 +105,7 @@
     - name: "[CONFIG REPO VN] Add-repos-vn"
       import_role:
         name: config-repo-vn
-      when: repo-vn_enabled is defined and repo-vn_enabled
+      when: repo_vn_enabled is defined and repo_vn_enabled
       tags: config-repo-vn_config
 
     - name: "[CONFIG FAIL2BAN] Install and configure fail2ban service"
@@ -117,13 +117,13 @@
     - name: "[CONFIG NAGIOS NRPE] Install and configure nagios nrpe service"
       import_role:
         name: config-nagios-nrpe
-      when: nagios-nrpe_enabled is defined and nagios-nrpe_enabled
+      when: nagios_nrpe_enabled is defined and nagios_nrpe_enabled
       tags: config-nagios-nrpe_config
 
     - name: "[CONFIG SERVER TYPE] Install guest side"
       import_role:
         name: config-server-type
-      when: server-type_enabled is defined and server-type_enabled
+      when: server_type_enabled is defined and server_type_enabled
       tags: config-server-type_config
 
     - name: "[CONFIG NTP] Install and configure ntp"
@@ -135,13 +135,13 @@
     - name: "[CONFIG AUTOFS HOMES] Install and configure AUTOFS HOMES"
       import_role:
         name: config-autofs-homes
-      when: autofs-homes_enabled is defined and autofs-homes_enabled
+      when: autofs_homes_enabled is defined and autofs_homes_enabled
       tags: config-autofs-homes_config
 
     - name: "[CONFIG ZABBIX AGENT] Install and configure ZABBIX AGENT"
       import_role:
         name: config-zabbix-agent
-      when: zabbix-agent_enabled is defined and zabbix-agent_enabled
+      when: zabbix_agent_enabled is defined and zabbix_agent_enabled
       tags: config-zabbix-agent_config
 
 #handlers: