diff --git a/elements/dib-python/environment.d/50-dib-python-version b/elements/dib-python/environment.d/50-dib-python-version
index 58a5dc7a..783126e8 100644
--- a/elements/dib-python/environment.d/50-dib-python-version
+++ b/elements/dib-python/environment.d/50-dib-python-version
@@ -5,6 +5,8 @@ if [ -z "${DIB_PYTHON_VERSION:-}" ]; then
             DIB_PYTHON_VERSION=2
         elif [ "$DIB_RELEASE" == "trusty" ]; then
             DIB_PYTHON_VERSION=2
+        elif [ "$DIB_RELEASE" == "xenial" ]; then
+	    DIB_PYTHON_VERSION=2
         fi
     elif [ "$DISTRO_NAME" == "debian" ]; then
         DIB_PYTHON_VERSION=2
diff --git a/elements/ubuntu/pre-install.d/00-install-python b/elements/ubuntu/pre-install.d/00-install-python
new file mode 100755
index 00000000..19ae8f66
--- /dev/null
+++ b/elements/ubuntu/pre-install.d/00-install-python
@@ -0,0 +1,10 @@
+#!/bin/bash
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
+set -eu
+set -o pipefail
+
+# hack to get python into Xenial python3 only images, while we
+# work-around issues.
+apt-get -y install python || true