diff --git a/fabfile/tasks/kernel.py b/fabfile/tasks/kernel.py
index 5b445e443..572ce3224 100644
--- a/fabfile/tasks/kernel.py
+++ b/fabfile/tasks/kernel.py
@@ -23,7 +23,7 @@ def set_grub_default_node(*args, **kwargs):
 
 @task
 @roles('all')
-def set_grub_default(value='Advanced options for Ubuntu>Ubuntu, with Linux 3.13.0-100-generic'):
+def set_grub_default(value='Advanced options for Ubuntu>Ubuntu, with Linux 3.13.0-106-generic'):
     '''Set default kernel version to bootup for all nodes'''
     execute('set_grub_default_node', env.host_string, value=value)
 
@@ -43,7 +43,7 @@ def upgrade_kernel_all(*tgzs, **kwargs):
             default_grub='Advanced options for Ubuntu>Ubuntu, with Linux 3.13.0-34-generic'
         elif version == '14.04':
             if kernel_ver is None:
-                kernel_ver='3.13.0-100'
+                kernel_ver='3.13.0-106'
             (package, os_type) = ('linux-image-'+kernel_ver+'-generic', 'ubuntu')
             default_grub='Advanced options for Ubuntu>Ubuntu, with Linux '+kernel_ver+'-generic'
         elif 'centos linux' in dist.lower() and version.startswith('7'):
@@ -129,7 +129,7 @@ def upgrade_kernel_node(*args, **kwargs):
                 if 'version' in kwargs:
                     kernel_ver = kwargs.get('version')
                 else:
-                    kernel_ver = "3.13.0-100"
+                    kernel_ver = "3.13.0-106"
                 print "Installing "+kernel_ver+" kernel headers"
                 apt_install(["linux-headers-"+kernel_ver,
                              "linux-headers-"+kernel_ver+"-generic"])
@@ -172,6 +172,6 @@ def migrate_compute_kernel_node(*args, **kwargs):
             if 'version' in kwargs:
                 kernel_ver = kwargs.get('version')
             else:
-                kernel_ver = "3.13.0-100"
+                kernel_ver = "3.13.0-106"
             sudo('apt-get -o Dpkg::Options::="--force-overwrite" -y install contrail-vrouter-'+kernel_ver+'-generic')
             upgrade_kernel_node(host_string, **kwargs)
diff --git a/fabfile/tasks/upgrade.py b/fabfile/tasks/upgrade.py
index a3328d2f0..493a2d611 100644
--- a/fabfile/tasks/upgrade.py
+++ b/fabfile/tasks/upgrade.py
@@ -224,6 +224,16 @@ def upgrade_compute_node(from_rel, pkg, *args, **kwargs):
                     if version == '14.04' and 'contrail-vrouter-3.13.0-85-generic' in pkgs:
                        pkgs.remove('contrail-vrouter-3.13.0-85-generic')
                        pkgs.append('contrail-vrouter-3.13.0-100-generic')
+                elif LooseVersion(from_rel) <= LooseVersion('3.2.1.0'):
+                    dist, version, extra = get_linux_distro()
+                    if version == '14.04' and 'contrail-vrouter-3.13.0-106-generic' in pkgs:
+                       if 'contrail-vrouter-3.13.0-40-generic' in pkgs:
+                          pkgs.remove('contrail-vrouter-3.13.0-40-generic')
+                       if 'contrail-vrouter-3.13.0-85-generic' in pkgs:
+                          pkgs.remove('contrail-vrouter-3.13.0-85-generic')
+                       if 'contrail-vrouter-3.13.0-100-generic' in pkgs:
+                          pkgs.remove('contrail-vrouter-3.13.0-100-generic')
+                       pkgs.append('contrail-vrouter-3.13.0-106-generic')
                 # Identify roles of this node.
                 roles = ['compute']
                 if env.host_string in get_tsn_nodes():