diff --git a/roles/kesl/tasks/main.yml b/roles/kesl/tasks/main.yml
index 34b5e2a..4907e45 100644
--- a/roles/kesl/tasks/main.yml
+++ b/roles/kesl/tasks/main.yml
@@ -8,6 +8,7 @@
     - name: "Installing kesl package"
       yum:
         name: /tmp/kesl_red.rpm
+        disable_gpg_check: true
     - name: "Deleting distros"
       file:
         path: "/tmp/klnagent_red.rpm"
@@ -22,7 +23,7 @@
         dest: "/tmp"
         mode: 0755
     - name: "Installing kesl package"
-      dnf:
+      apt:
         name: /tmp/kesl_deb.deb
     - name: "Deleting distros"
       file:
@@ -32,14 +33,14 @@
 
 
 - block:
-    - name: "Creating answer file for klnagent"
+    - name: "Creating answer file for kesl"
       become: true
       template:
         src: kesl.j2
         dest: /tmp/kesl.ini
         mode: 0644
 
-    - name: "Run configuring klnagent"
+    - name: "Run configuring kesl"
       become: true
       shell: "/opt/kaspersky/kesl/bin/kesl-setup.pl --autoinstall=/tmp/kesl.ini"
       args:
diff --git a/roles/kesl/templates/kesl.j2 b/roles/kesl/templates/kesl.j2
index 06405ae..bf4952a 100644
--- a/roles/kesl/templates/kesl.j2
+++ b/roles/kesl/templates/kesl.j2
@@ -1,12 +1,24 @@
-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 %}
+{% if EULA_AGREED %}EULA_AGREED={{ EULA_AGREED }}{% endif %}
+
+{% if PRIVACY_POLICY_AGREED %}PRIVACY_POLICY_AGREED={{ PRIVACY_POLICY_AGREED }}{% endif %}
+
+{% if USE_KSN %}USE_KSN={{ USE_KSN }}{% endif %}
+
+{% if LOCALE %}LOCALE={{ LOCALE }}{% endif %}
+
+{% if INSTALL_LICENSE %}INSTALL_LICENSE={{ INSTALL_LICENSE }}{% endif %}
+
+{% if UPDATER_SOURCE %}UPDATER_SOURCE={{ UPDATER_SOURCE }}{% endif %}
+
+{% if PROXY_SERVER %}PROXY_SERVER={{ PROXY_SERVER }}{% endif %}
+
+{% if UPDATE_EXECUTE %}UPDATE_EXECUTE={{ UPDATE_EXECUTE }}{% endif %}
+
+{% if KERNEL_SRCS_INSTALL %}KERNEL_SRCS_INSTALL={{ KERNEL_SRCS_INSTALL }}{% endif %}
+
+{% if ADMIN_USER %}ADMIN_USER={{ ADMIN_USER }}{% endif %}
+
+{% if CONFIGURE_SELINUX %}CONFIGURE_SELINUX={{ CONFIGURE_SELINUX }}{% endif %}
+
+{% if USE_GUI %}USE_GUI={{ USE_GUI }}{% endif %}
+
diff --git a/roles/klnagent/templates/klnagent.j2 b/roles/klnagent/templates/klnagent.j2
index 1a48337..9707098 100644
--- a/roles/klnagent/templates/klnagent.j2
+++ b/roles/klnagent/templates/klnagent.j2
@@ -1,16 +1,31 @@
-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 %}
+{% if KLNAGENT_SERVER %}KLNAGENT_SERVER={{ KLNAGENT_SERVER }}{% endif %}
+
+{% if KLNAGENT_AUTOINSTALL %}KLNAGENT_AUTOINSTALL={{ KLNAGENT_AUTOINSTALL }}{% endif %}
+
+{% if EULA_ACCEPTED %}EULA_ACCEPTED={{ EULA_ACCEPTED }}{% endif %}
+
+{% if KLNAGENT_PROXY_USE %}KLNAGENT_PROXY_USE={{ KLNAGENT_PROXY_USE }}{% endif %}
+
+{% if KLNAGENT_PROXY_ADDRESS %}KLNAGENT_PROXY_ADDRESS={{ KLNAGENT_PROXY_ADDRESS }}{% endif %}
+
+{% if KLNAGENT_PROXY_LOGIN %}KLNAGENT_PROXY_LOGIN={{ KLNAGENT_PROXY_LOGIN }}{% endif %}
+
+{% if KLNAGENT_PROXY_PASSWORD %}KLNAGENT_PROXY_PASSWORD={{ KLNAGENT_PROXY_PASSWORD }}{% endif %}
+
+{% if KLNAGENT_VM_VDI %}KLNAGENT_VM_VDI={{ KLNAGENT_VM_VDI }}{% endif %}
+
+{% if KLNAGENT_VM_OPTIMIZE %}KLNAGENT_VM_OPTIMIZE={{ KLNAGENT_VM_OPTIMIZE }}{% endif %}
+
+{% if KLNAGENT_TAGS %}KLNAGENT_TAGS={{ KLNAGENT_TAGS }}{% endif %}
+
+{% if KLNAGENT_UDP_PORT %}KLNAGENT_UDP_PORT={{ KLNAGENT_UDP_PORT }}{% endif %}
+
+{% if KLNAGENT_PORT %}KLNAGENT_PORT={{ KLNAGENT_PORT }}{% endif %}
+
+{% if KLNAGENT_SSLPORT %}KLNAGENT_SSLPORT={{ KLNAGENT_SSLPORT }}{% endif %}
+
+{% if KLNAGENT_USESSL %}KLNAGENT_USESSL={{ KLNAGENT_USESSL }}{% endif %}
+
+{% if KLNAGENT_GW_MODE %}KLNAGENT_GW_MODE={{ KLNAGENT_GW_MODE }}{% endif %}
+
+{% if KLNAGENT_GW_ADDRESS %}KLNAGENT_GW_ADDRESS={{ KLNAGENT_GW_ADDRESS }}{% endif %}