diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh
index a1367242..d60ac40b 100755
--- a/diskimage-create/diskimage-create.sh
+++ b/diskimage-create/diskimage-create.sh
@@ -504,7 +504,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "vanilla" ]; then
         if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "2.7.1" ]; then
             export DIB_HADOOP_VERSION=${DIB_HADOOP_VERSION_2_7_1:-"2.7.1"}
             export ubuntu_image_name=${ubuntu_vanilla_hadoop_2_7_1_image_name:-"ubuntu_sahara_vanilla_hadoop_2_7_1_latest"}
-            export DIB_RELEASE=${DIB_RELEASE:-trusty}
+            export DIB_RELEASE=${DIB_RELEASE:-xenial}
             image_create ubuntu $ubuntu_image_name $ubuntu_elements_sequence
             unset DIB_RELEASE
         fi
@@ -587,7 +587,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "storm" ]; then
     ubuntu_elements_sequence="$JAVA_ELEMENT zookeeper storm"
 
     # Creating Ubuntu cloud image
-    export DIB_RELEASE=${DIB_RELEASE:-trusty}
+    export DIB_RELEASE=${DIB_RELEASE:-xenial}
     image_create ubuntu $ubuntu_image_name $ubuntu_elements_sequence
     unset DIB_RELEASE
     unset DIB_CLOUD_INIT_DATASOURCES
diff --git a/elements/mysql/pkg-map b/elements/mysql/pkg-map
index e0c4751c..b286f72a 100644
--- a/elements/mysql/pkg-map
+++ b/elements/mysql/pkg-map
@@ -19,13 +19,23 @@
       "mysql_java_package": "mysql-connector-java"
     }
   },
+  "release": {
+    "ubuntu": {
+      "trusty": {
+        "mysql_package": "mysql-client-5.5",
+        "mysql_libs_package": "",
+        "mysql_server_package": "mysql-server-5.5",
+        "mysql_java_package": "libmysql-java"
+      },
+      "xenial": {
+        "mysql_package": "mysql-client-5.7",
+        "mysql_libs_package": "",
+        "mysql_server_package": "mysql-server-5.7",
+        "mysql_java_package": "libmysql-java"
+      }
+    }
+  },
   "family": {
-    "debian": {
-      "mysql_package": "mysql-client-5.5",
-      "mysql_libs_package": "",
-      "mysql_server_package": "mysql-server-5.5",
-      "mysql_java_package": "libmysql-java"
-    },
     "redhat": {
       "mysql_package": "mysql",
       "mysql_libs_package": "mysql-libs",
diff --git a/elements/openjdk/install.d/33-java b/elements/openjdk/install.d/33-java
index 8d773292..d7ec23e3 100755
--- a/elements/openjdk/install.d/33-java
+++ b/elements/openjdk/install.d/33-java
@@ -10,7 +10,7 @@ echo "Installing OpenJDK"
 
 default_jdk_version_for_distro () {
     case "$DISTRO_NAME" in
-        centos | rhel | ubuntu )
+        centos | rhel )
             echo "7"
         ;;
         fedora )
@@ -23,6 +23,13 @@ default_jdk_version_for_distro () {
         centos7 | rhel7 )
             echo "8"
         ;;
+        ubuntu )
+            if [ "$DIB_RELEASE" = "trusty" ]; then
+                echo "7"
+            elif [ "$DIB_RELEASE" = "xenial" ]; then
+                echo "8"
+            fi
+        ;;
         *)
             echo "Unknown OpenJDK distro: $DISTRO_NAME" >&2
             exit 1
diff --git a/elements/storm/install.d/60-storm b/elements/storm/install.d/60-storm
index 95feb76c..cf89a4be 100755
--- a/elements/storm/install.d/60-storm
+++ b/elements/storm/install.d/60-storm
@@ -63,4 +63,10 @@ chown -R storm:storm /var/log/storm
 
 apt-get install -y python-dev
 apt-get install -y python-pip
+
+if [ "$DIB_RELEASE" = "xenial" ]; then
+    apt-get install -y python-setuptools # See launchpad bug 1556681
+    apt-get install -y python-wheel
+fi
+
 pip install pyleus