diff --git a/roles/kesl/templates/kesl.j2 b/roles/kesl/templates/kesl.j2
index c674337..06405ae 100644
--- a/roles/kesl/templates/kesl.j2
+++ b/roles/kesl/templates/kesl.j2
@@ -1,12 +1,12 @@
-EULA_AGREED={{ EULA_AGREED }}
-PRIVACY_POLICY_AGREED={{ PRIVACY_POLICY_AGREED }}
-USE_KSN={{ USE_KSN }}
-LOCALE={{ LOCALE }}
-INSTALL_LICENSE={{ INSTALL_LICENSE }}
-UPDATER_SOURCE={{ UPDATER_SOURCE }}
-PROXY_SERVER={{ PROXY_SERVER }}
-UPDATE_EXECUTE={{ UPDATE_EXECUTE }}
-KERNEL_SRCS_INSTALL={{ KERNEL_SRCS_INSTALL }}
-ADMIN_USER={{ ADMIN_USER }}
-CONFIGURE_SELINUX={{ CONFIGURE_SELINUX }}
-USE_GUI={{ USE_GUI }}
\ No newline at end of file
+EULA_AGREED{% if EULA_AGREED %}={{ EULA_AGREED }}{% endif %}
+PRIVACY_POLICY_AGREED{% if PRIVACY_POLICY_AGREED %}={{ PRIVACY_POLICY_AGREED }}{% endif %}
+USE_KSN{% if USE_KSN %}={{ USE_KSN }}{% endif %}
+LOCALE{% if LOCALE %}={{ LOCALE }}{% endif %}
+INSTALL_LICENSE{% if INSTALL_LICENSE %}={{ INSTALL_LICENSE }}{% endif %}
+UPDATER_SOURCE{% if UPDATER_SOURCE %}={{ UPDATER_SOURCE }}{% endif %}
+PROXY_SERVER{% if PROXY_SERVER %}={{ PROXY_SERVER }}{% endif %}
+UPDATE_EXECUTE{% if UPDATE_EXECUTE %}={{ UPDATE_EXECUTE }}{% endif %}
+KERNEL_SRCS_INSTALL{% if KERNEL_SRCS_INSTALL %}={{ KERNEL_SRCS_INSTALL }}{% endif %}
+ADMIN_USER{% if ADMIN_USER %}={{ ADMIN_USER }}{% endif %}
+CONFIGURE_SELINUX{% if CONFIGURE_SELINUX %}={{ CONFIGURE_SELINUX }}{% endif %}
+USE_GUI{% if USE_GUI %}={{ USE_GUI }}{% endif %}
diff --git a/roles/klnagent/templates/klnagent.j2 b/roles/klnagent/templates/klnagent.j2
index 74a29db..1a48337 100644
--- a/roles/klnagent/templates/klnagent.j2
+++ b/roles/klnagent/templates/klnagent.j2
@@ -1,16 +1,16 @@
-KLNAGENT_SERVER={{ KLNAGENT_SERVER }}
-KLNAGENT_AUTOINSTALL={{ KLNAGENT_AUTOINSTALL }}
-EULA_ACCEPTED={{ EULA_ACCEPTED }}
-KLNAGENT_PROXY_USE={{ KLNAGENT_PROXY_USE }}
-KLNAGENT_PROXY_ADDRESS={{ KLNAGENT_PROXY_ADDRESS }}
-KLNAGENT_PROXY_LOGIN={{ KLNAGENT_PROXY_LOGIN }}
-KLNAGENT_PROXY_PASSWORD={{ KLNAGENT_PROXY_PASSWORD }}
-KLNAGENT_VM_VDI={{ KLNAGENT_VM_VDI }}
-KLNAGENT_VM_OPTIMIZE={{ KLNAGENT_VM_OPTIMIZE }}
-KLNAGENT_TAGS={{ KLNAGENT_TAGS }}
-KLNAGENT_UDP_PORT={{ KLNAGENT_UDP_PORT }}
-KLNAGENT_PORT={{ KLNAGENT_PORT }}
-KLNAGENT_SSLPORT={{ KLNAGENT_SSLPORT }}
-KLNAGENT_USESSL={{ KLNAGENT_USESSL }}
-KLNAGENT_GW_MODE={{ KLNAGENT_GW_MODE }}
-KLNAGENT_GW_ADDRESS={{ KLNAGENT_GW_ADDRESS }}
\ No newline at end of file
+KLNAGENT_SERVER{% if KLNAGENT_SERVER %}={{ KLNAGENT_SERVER }}{% endif %}
+KLNAGENT_AUTOINSTALL{% if KLNAGENT_AUTOINSTALL %}={{ KLNAGENT_AUTOINSTALL }}{% endif %}
+EULA_ACCEPTED{% if EULA_ACCEPTED %}={{ EULA_ACCEPTED }}{% endif %}
+KLNAGENT_PROXY_USE{% if KLNAGENT_PROXY_USE %}={{ KLNAGENT_PROXY_USE }}{% endif %}
+KLNAGENT_PROXY_ADDRESS{% if KLNAGENT_PROXY_ADDRESS %}={{ KLNAGENT_PROXY_ADDRESS }}{% endif %}
+KLNAGENT_PROXY_LOGIN{% if KLNAGENT_PROXY_LOGIN %}={{ KLNAGENT_PROXY_LOGIN }}{% endif %}
+KLNAGENT_PROXY_PASSWORD{% if KLNAGENT_PROXY_PASSWORD %}={{ KLNAGENT_PROXY_PASSWORD }}{% endif %}
+KLNAGENT_VM_VDI{% if KLNAGENT_VM_VDI %}={{ KLNAGENT_VM_VDI }}{% endif %}
+KLNAGENT_VM_OPTIMIZE{% if KLNAGENT_VM_OPTIMIZE %}={{ KLNAGENT_VM_OPTIMIZE }}{% endif %}
+KLNAGENT_TAGS{% if KLNAGENT_TAGS %}={{ KLNAGENT_TAGS }}{% endif %}
+KLNAGENT_UDP_PORT{% if KLNAGENT_UDP_PORT %}={{ KLNAGENT_UDP_PORT }}{% endif %}
+KLNAGENT_PORT{% if KLNAGENT_PORT %}={{ KLNAGENT_PORT }}{% endif %}
+KLNAGENT_SSLPORT{% if KLNAGENT_SSLPORT %}={{ KLNAGENT_SSLPORT }}{% endif %}
+KLNAGENT_USESSL{% if KLNAGENT_USESSL %}={{ KLNAGENT_USESSL }}{% endif %}
+KLNAGENT_GW_MODE{% if KLNAGENT_GW_MODE %}={{ KLNAGENT_GW_MODE }}{% endif %}
+KLNAGENT_GW_ADDRESS{% if KLNAGENT_GW_ADDRESS %}={{ KLNAGENT_GW_ADDRESS }}{% endif %}