diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index b26ea25..d7da8ca 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -207,3 +207,7 @@
     # karaf-home
     # Use to grab the logs or onos-diagnostics
     karaf-home: 'apache-karaf-4.2.9'
+
+    # maven version
+    # Have to setup JAVA_HOME correctly if we upgrade to mvn36
+    maven-version: mvn33
diff --git a/jjb/maven.yaml b/jjb/maven.yaml
index c62e185..ac461dc 100644
--- a/jjb/maven.yaml
+++ b/jjb/maven.yaml
@@ -57,6 +57,7 @@
           settings: 'cord-apps-maven-settings'
           settings-type: cfp
           goals: '-Pci-verify clean test install spotbugs:check'
+          maven-version: '{maven-version}'
 
     publishers:
       - junit:
diff --git a/packer/provision/baseline.yaml b/packer/provision/baseline.yaml
index 1aad172..2c43ecf 100644
--- a/packer/provision/baseline.yaml
+++ b/packer/provision/baseline.yaml
@@ -17,7 +17,7 @@
         dest: /etc/sudoers.d/89-jenkins-user-defaults
         content: |
           Defaults:jenkins !requiretty
-          jenkins ALL=(ALL) NOPASSWD:ALL
+          jenkins ALL = NOPASSWD: /usr/sbin/update-alternatives, /usr/sbin/update-java-alternatives
         validate: /usr/sbin/visudo -cf %s
       become: yes
 
diff --git a/packer/provision/onf-playbook.yaml b/packer/provision/onf-playbook.yaml
index 206fec8..c69e00c 100644
--- a/packer/provision/onf-playbook.yaml
+++ b/packer/provision/onf-playbook.yaml
@@ -7,6 +7,16 @@
   become: true
 
   tasks:
+    - name: Add Java Amazon Corretto Jdk repo GPG key
+      apt_key:
+        url: https://apt.corretto.aws/corretto.key
+        state: present
+
+    - name: Add Java Amazon Corretto Jdk repo
+      apt_repository:
+        repo: deb https://apt.corretto.aws stable main
+        state: present
+
     - name: Install apt packages
       apt:
         name:
@@ -37,6 +47,8 @@
           - "nodejs-dev"
           - "node-gyp"
           - "npm"
+          - "java-1.8.0-amazon-corretto-jdk"
+          - "java-11-amazon-corretto-jdk"
         state: "present"
         update_cache: true
         cache_valid_time: 3600
diff --git a/packer/templates/basebuild_1804.json b/packer/templates/basebuild_1804.json
index 668b282..0bd5455 100644
--- a/packer/templates/basebuild_1804.json
+++ b/packer/templates/basebuild_1804.json
@@ -11,6 +11,7 @@
         "source_ami_filter_name": null,
         "source_ami_filter_owner": null,
         "source_ami_filter_product_code": "",
+        "vm_volume_size": "20",
         "subnet_id": null,
         "ssh_user": null
     },
@@ -37,6 +38,14 @@
             "ssh_username": "{{user `ssh_user`}}",
             "subnet_id": "{{user `subnet_id`}}",
             "type": "amazon-ebs",
+            "launch_block_device_mappings": [
+                {
+                    "device_name": "/dev/sda1",
+                    "volume_size": "{{user `vm_volume_size`}}",
+                    "volume_type": "gp2",
+                    "delete_on_termination": true
+                }
+            ],
             "user_data_file": "{{user `cloud_user_data`}}"
         }
     ],