diff --git a/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/underlay--user-data1604.yaml b/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/underlay--user-data1604.yaml
index e6ceb1a..410a639 100644
--- a/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookieshape-mcp-ocata-dvr-vxlan/underlay--user-data1604.yaml
@@ -33,6 +33,9 @@
    - sudo echo "nameserver {gateway}" >> /etc/resolvconf/resolv.conf.d/base
    - sudo resolvconf -u
 
+   # Enable grub menu using updated config below
+   - update-grub
+
    # Prepare network connection
    - sudo ifup ens3
    #- sudo route add default gw {gateway} {interface_name}
@@ -65,13 +68,23 @@
    # Install salt-minion and stop it until it is configured
    - eatmydata apt-get install -y salt-minion && service salt-minion stop
 
+   # Install latest kernel
+   - eatmydata apt-get install -y linux-generic-hwe-16.04
+
    ########################################################
    # Node is ready, allow SSH access
-   - echo "Allow SSH access ..."
-   - sudo iptables -D INPUT -p tcp --dport 22 -j DROP
+   #- echo "Allow SSH access ..."
+   #- sudo iptables -D INPUT -p tcp --dport 22 -j DROP
+   - reboot
    ########################################################
 
   write_files:
+   - path: /etc/default/grub.d/97-enable-grub-menu.cfg
+     content: |
+         GRUB_RECORDFAIL_TIMEOUT=30
+         GRUB_TIMEOUT=3
+         GRUB_TIMEOUT_STYLE=menu
+
    - path: /etc/network/interfaces
      content: |
           auto ens3