diff --git a/ubuntu/python-virtualenv/Dockerfile b/experimental/ubuntu/python-virtualenv/Dockerfile
similarity index 100%
rename from ubuntu/python-virtualenv/Dockerfile
rename to experimental/ubuntu/python-virtualenv/Dockerfile
diff --git a/experimental/ubuntu/ubuntu18.04-minimal/ubuntu18.04-minimal b/experimental/ubuntu/ubuntu16.04-minimal/Dockerfile
similarity index 56%
rename from experimental/ubuntu/ubuntu18.04-minimal/ubuntu18.04-minimal
rename to experimental/ubuntu/ubuntu16.04-minimal/Dockerfile
index 23d1cf8..6b868d1 100644
--- a/experimental/ubuntu/ubuntu18.04-minimal/ubuntu18.04-minimal
+++ b/experimental/ubuntu/ubuntu16.04-minimal/Dockerfile
@@ -1,4 +1,8 @@
-FROM ubuntu:18.04
+# The minimal image defines the minimum requirements to run a Docker image in Databricks.
+# If you are building your own image from scratch, make sure you have the libraries
+# included below.
+
+FROM ubuntu:16.04
 
 RUN apt-get update \
   && apt-get install --yes \
@@ -8,7 +12,6 @@ RUN apt-get update \
     sudo \
     coreutils \
     procps \
-    strace \ #strace should be installed for users who are trying to set withStrace on their clusters
   && /var/lib/dpkg/info/ca-certificates-java.postinst configure \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
diff --git a/experimental/ubuntu/ubuntu18.04-minimal/README.md b/experimental/ubuntu/ubuntu16.04-minimal/README.md
similarity index 68%
rename from experimental/ubuntu/ubuntu18.04-minimal/README.md
rename to experimental/ubuntu/ubuntu16.04-minimal/README.md
index 78d1283..3e22f05 100644
--- a/experimental/ubuntu/ubuntu18.04-minimal/README.md
+++ b/experimental/ubuntu/ubuntu16.04-minimal/README.md
@@ -1,4 +1,4 @@
-# This image specifically for Databricks Runtime 7.x; please check there for reference https://docs.databricks.com/release-notes/runtime/releases.html#databricks-runtime-releases
+# This image specifically for Databricks Runtime 6.x; please check here for reference https://docs.databricks.com/release-notes/runtime/releases.html#databricks-runtime-releases
 
 # Minimal Container
 
diff --git a/ubuntu/minimal/Dockerfile b/ubuntu/minimal/Dockerfile
index 6b868d1..1af094a 100644
--- a/ubuntu/minimal/Dockerfile
+++ b/ubuntu/minimal/Dockerfile
@@ -1,8 +1,4 @@
-# The minimal image defines the minimum requirements to run a Docker image in Databricks.
-# If you are building your own image from scratch, make sure you have the libraries
-# included below.
-
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 RUN apt-get update \
   && apt-get install --yes \
diff --git a/ubuntu/minimal/README.md b/ubuntu/minimal/README.md
index 3e22f05..78d1283 100644
--- a/ubuntu/minimal/README.md
+++ b/ubuntu/minimal/README.md
@@ -1,4 +1,4 @@
-# This image specifically for Databricks Runtime 6.x; please check here for reference https://docs.databricks.com/release-notes/runtime/releases.html#databricks-runtime-releases
+# This image specifically for Databricks Runtime 7.x; please check there for reference https://docs.databricks.com/release-notes/runtime/releases.html#databricks-runtime-releases
 
 # Minimal Container
 
diff --git a/ubuntu/python/Dockerfile b/ubuntu/python/Dockerfile
index 58624eb..233a7ba 100644
--- a/ubuntu/python/Dockerfile
+++ b/ubuntu/python/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04 as builder
+FROM ubuntu:18.04 as builder
 
 RUN apt-get update && apt-get install --yes \
     wget \