diff --git a/roles/0-init/tasks/main.yml b/roles/0-init/tasks/main.yml
index 59cd5d2ed..12ddc7918 100644
--- a/roles/0-init/tasks/main.yml
+++ b/roles/0-init/tasks/main.yml
@@ -135,21 +135,24 @@
 # For various reasons the mysql service cannot be enabled on Fedora 20, but
 # 'mariadb', which is its real name can.  On Fedora 18 we need to use 'mysqld'.
 
-- name: "Set mysql_service: mariadb by default"
-  set_fact:
-    mysql_service: mariadb
+# BETTER TO USE /opt/iiab/iiab/vars/<OS>.yml
+#- name: "Set mysql_service: mariadb by default"
+#  set_fact:
+#    mysql_service: mariadb
 
 - name: "Set mysql_service: mysqld etc (Fedora 18)"
   set_fact:
-    mysql_service: mysqld
+    # BETTER TO USE /opt/iiab/iiab/vars/<OS>.yml
+    #mysql_service: mysqld
     no_NM_reload: True
     is_F18: True
   when: (ansible_distribution_release == "based on Fedora 18" or ansible_distribution_version == "18") and ansible_distribution == "Fedora"
 
-- name: "Set mysql_service: mysql (debuntu)"
-  set_fact:
-    mysql_service: mysql
-  when: is_debuntu
+# BETTER TO USE /opt/iiab/iiab/vars/<OS>.yml
+#- name: "Set mysql_service: mysql (debuntu)"
+#  set_fact:
+#    mysql_service: mysql
+#  when: is_debuntu
 
 - name: "Set iiab_fqdn: {{ iiab_hostname }}.{{ iiab_domain }}"
   set_fact:
@@ -206,6 +209,10 @@
       value:  "{{ first_run }}"
     - option: local_tz
       value:  "{{ local_tz }}"
+    - option: no_NM_reload
+      value: "{{ no_NM_reload }}"
+    - option: is_F18
+      value: "{{ is_F18 }}"
     - option: FQDN_changed
       value:  "{{ FQDN_changed }}"