diff --git a/common/ubuntu_base.sh b/common/ubuntu_base.sh
index 58d3855..fbb475e 100644
--- a/common/ubuntu_base.sh
+++ b/common/ubuntu_base.sh
@@ -47,10 +47,7 @@
 # Cleanup old kernels, ensure latest is installed via metapackage package
 if [ ! -f /tmp/no_install_kernel ]; then
     apt-get purge -y linux-image-* linux-headers-* | grep -v 'is not installed, so not removed'
-    # FIXME: temporary switch back to LTS kernel, till PROD-23185 will be fixed
-    #apt-get install -y linux-image-virtual-hwe-16.04 linux-image-extra-virtual-hwe-16.04
-    apt-get install -y linux-image-virtual-lts-xenial linux-image-extra-virtual-lts-xenial
-
+    apt-get install -y linux-image-virtual-hwe-16.04 linux-image-extra-virtual-hwe-16.04 linux-headers-generic-hwe-16.04
     # Update grub cmdline
     sed -i 's|GRUB_CMDLINE_LINUX_DEFAULT=.*|GRUB_CMDLINE_LINUX_DEFAULT="console=tty0 console=ttyS0,115200n8"|g' /etc/default/grub
     sed -i 's|GRUB_CMDLINE_LINUX=.*|GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8"|g' /etc/default/grub
diff --git a/common/ubuntu_salt_bootstrap.sh b/common/ubuntu_salt_bootstrap.sh
index 3510b85..f03f757 100644
--- a/common/ubuntu_salt_bootstrap.sh
+++ b/common/ubuntu_salt_bootstrap.sh
@@ -17,7 +17,7 @@
 GIT_SALT_FORMULAS_SCRIPTS_REF=${GIT_SALT_FORMULAS_SCRIPTS_REF:-master}
 
 function process_repos(){
-# TODO: those  should be unhardcoded and re-writed to mirror.mirantis.com logic
+# TODO: those  should be unhardcoded and re-writed, using CC model
 wget -O - ${SALTSTACK_GPG} | sudo apt-key add -
 wget -O - ${APT_MIRANTIS_GPG} | apt-key add -
 wget -O - http://mirror.mirantis.com/${FORMULA_VERSION}/extra/xenial/archive-extra.key | apt-key add -