diff --git a/2.7/Dockerfile b/2.7/Dockerfile
index 8b8b9a44f..27b3d2c41 100644
--- a/2.7/Dockerfile
+++ b/2.7/Dockerfile
@@ -27,7 +27,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-shared \
+		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/2.7/alpine/Dockerfile b/2.7/alpine/Dockerfile
index f834cfe36..f7e62c533 100644
--- a/2.7/alpine/Dockerfile
+++ b/2.7/alpine/Dockerfile
@@ -13,16 +13,15 @@ ENV PYTHON_VERSION 2.7.12
 ENV PYTHON_PIP_VERSION 8.1.2
 
 RUN set -ex \
-	&& apk add --no-cache --virtual .fetch-deps curl gnupg \
+	&& apk add --no-cache --virtual .fetch-deps curl gnupg tar xz \
 	&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
 	&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
 	&& export GNUPGHOME="$(mktemp -d)" \
 	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
 	&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
 	&& rm -r "$GNUPGHOME" python.tar.xz.asc \
-	&& mkdir -p /usr/src \
-	&& tar -xJC /usr/src -f python.tar.xz \
-	&& mv "/usr/src/Python-$PYTHON_VERSION" /usr/src/python \
+	&& mkdir -p /usr/src/python \
+	&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
 	&& rm python.tar.xz \
 	\
 	&& apk add --no-cache --virtual .build-deps  \
@@ -38,7 +37,9 @@ RUN set -ex \
 		sqlite-dev \
 		zlib-dev \
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-shared \
+		--enable-unicode=ucs4 \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \
 	&& make install \
 	&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \
diff --git a/2.7/slim/Dockerfile b/2.7/slim/Dockerfile
index db6b006ff..0d0e5571b 100644
--- a/2.7/slim/Dockerfile
+++ b/2.7/slim/Dockerfile
@@ -47,7 +47,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-shared \
+		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/2.7/wheezy/Dockerfile b/2.7/wheezy/Dockerfile
index 57464a0a8..3673974ed 100644
--- a/2.7/wheezy/Dockerfile
+++ b/2.7/wheezy/Dockerfile
@@ -27,7 +27,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-shared \
+		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.3/Dockerfile b/3.3/Dockerfile
index 157dc24f9..2417f4b59 100644
--- a/3.3/Dockerfile
+++ b/3.3/Dockerfile
@@ -27,7 +27,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-loadable-sqlite-extensions \
+		--enable-shared \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.3/alpine/Dockerfile b/3.3/alpine/Dockerfile
index 50b63a0f3..f081ebcf4 100644
--- a/3.3/alpine/Dockerfile
+++ b/3.3/alpine/Dockerfile
@@ -13,16 +13,15 @@ ENV PYTHON_VERSION 3.3.6
 ENV PYTHON_PIP_VERSION 8.1.2
 
 RUN set -ex \
-	&& apk add --no-cache --virtual .fetch-deps curl gnupg \
+	&& apk add --no-cache --virtual .fetch-deps curl gnupg tar xz \
 	&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
 	&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
 	&& export GNUPGHOME="$(mktemp -d)" \
 	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
 	&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
 	&& rm -r "$GNUPGHOME" python.tar.xz.asc \
-	&& mkdir -p /usr/src \
-	&& tar -xJC /usr/src -f python.tar.xz \
-	&& mv "/usr/src/Python-$PYTHON_VERSION" /usr/src/python \
+	&& mkdir -p /usr/src/python \
+	&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
 	&& rm python.tar.xz \
 	\
 	&& apk add --no-cache --virtual .build-deps  \
@@ -39,7 +38,9 @@ RUN set -ex \
 		xz-dev \
 		zlib-dev \
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-loadable-sqlite-extensions \
+		--enable-shared \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \
 	&& make install \
 	&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
diff --git a/3.3/slim/Dockerfile b/3.3/slim/Dockerfile
index 263c7ac5d..9c5cfbc89 100644
--- a/3.3/slim/Dockerfile
+++ b/3.3/slim/Dockerfile
@@ -48,7 +48,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-loadable-sqlite-extensions \
+		--enable-shared \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.3/wheezy/Dockerfile b/3.3/wheezy/Dockerfile
index c79288798..bae993ea8 100644
--- a/3.3/wheezy/Dockerfile
+++ b/3.3/wheezy/Dockerfile
@@ -27,7 +27,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-loadable-sqlite-extensions \
+		--enable-shared \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.4/Dockerfile b/3.4/Dockerfile
index 4f5d65d3f..094a16b53 100644
--- a/3.4/Dockerfile
+++ b/3.4/Dockerfile
@@ -27,7 +27,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-loadable-sqlite-extensions \
+		--enable-shared \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.4/alpine/Dockerfile b/3.4/alpine/Dockerfile
index 8736bd733..b4b71c0d2 100644
--- a/3.4/alpine/Dockerfile
+++ b/3.4/alpine/Dockerfile
@@ -13,16 +13,15 @@ ENV PYTHON_VERSION 3.4.5
 ENV PYTHON_PIP_VERSION 8.1.2
 
 RUN set -ex \
-	&& apk add --no-cache --virtual .fetch-deps curl gnupg \
+	&& apk add --no-cache --virtual .fetch-deps curl gnupg tar xz \
 	&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
 	&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
 	&& export GNUPGHOME="$(mktemp -d)" \
 	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
 	&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
 	&& rm -r "$GNUPGHOME" python.tar.xz.asc \
-	&& mkdir -p /usr/src \
-	&& tar -xJC /usr/src -f python.tar.xz \
-	&& mv "/usr/src/Python-$PYTHON_VERSION" /usr/src/python \
+	&& mkdir -p /usr/src/python \
+	&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
 	&& rm python.tar.xz \
 	&& apk del .fetch-deps \
 	\
@@ -40,7 +39,9 @@ RUN set -ex \
 		xz-dev \
 		zlib-dev \
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-loadable-sqlite-extensions \
+		--enable-shared \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \
 	&& make install \
 	&& pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
diff --git a/3.4/slim/Dockerfile b/3.4/slim/Dockerfile
index dcca4534a..c48f3eb0b 100644
--- a/3.4/slim/Dockerfile
+++ b/3.4/slim/Dockerfile
@@ -48,7 +48,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-loadable-sqlite-extensions \
+		--enable-shared \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.4/wheezy/Dockerfile b/3.4/wheezy/Dockerfile
index c668d32a3..84603b437 100644
--- a/3.4/wheezy/Dockerfile
+++ b/3.4/wheezy/Dockerfile
@@ -27,7 +27,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-loadable-sqlite-extensions \
+		--enable-shared \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.5/Dockerfile b/3.5/Dockerfile
index ceb718838..c88c9a9f9 100644
--- a/3.5/Dockerfile
+++ b/3.5/Dockerfile
@@ -27,7 +27,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-loadable-sqlite-extensions \
+		--enable-shared \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.5/alpine/Dockerfile b/3.5/alpine/Dockerfile
index 41b9fe215..51a481936 100644
--- a/3.5/alpine/Dockerfile
+++ b/3.5/alpine/Dockerfile
@@ -13,16 +13,15 @@ ENV PYTHON_VERSION 3.5.2
 ENV PYTHON_PIP_VERSION 8.1.2
 
 RUN set -ex \
-	&& apk add --no-cache --virtual .fetch-deps curl gnupg \
+	&& apk add --no-cache --virtual .fetch-deps curl gnupg tar xz \
 	&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
 	&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
 	&& export GNUPGHOME="$(mktemp -d)" \
 	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
 	&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
 	&& rm -r "$GNUPGHOME" python.tar.xz.asc \
-	&& mkdir -p /usr/src \
-	&& tar -xJC /usr/src -f python.tar.xz \
-	&& mv "/usr/src/Python-$PYTHON_VERSION" /usr/src/python \
+	&& mkdir -p /usr/src/python \
+	&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
 	&& rm python.tar.xz \
 	&& apk del .fetch-deps \
 	\
@@ -40,7 +39,9 @@ RUN set -ex \
 		xz-dev \
 		zlib-dev \
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-loadable-sqlite-extensions \
+		--enable-shared \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \
 	&& make install \
 	&& pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
diff --git a/3.5/slim/Dockerfile b/3.5/slim/Dockerfile
index 539a16d93..9e54379ac 100644
--- a/3.5/slim/Dockerfile
+++ b/3.5/slim/Dockerfile
@@ -48,7 +48,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-loadable-sqlite-extensions \
+		--enable-shared \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.6/Dockerfile b/3.6/Dockerfile
index 2a57be95b..a75fde754 100644
--- a/3.6/Dockerfile
+++ b/3.6/Dockerfile
@@ -27,7 +27,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-loadable-sqlite-extensions \
+		--enable-shared \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.6/alpine/Dockerfile b/3.6/alpine/Dockerfile
index 2f157f73d..6fdb503d5 100644
--- a/3.6/alpine/Dockerfile
+++ b/3.6/alpine/Dockerfile
@@ -13,16 +13,15 @@ ENV PYTHON_VERSION 3.6.0a2
 ENV PYTHON_PIP_VERSION 8.1.2
 
 RUN set -ex \
-	&& apk add --no-cache --virtual .fetch-deps curl gnupg \
+	&& apk add --no-cache --virtual .fetch-deps curl gnupg tar xz \
 	&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
 	&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
 	&& export GNUPGHOME="$(mktemp -d)" \
 	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
 	&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
 	&& rm -r "$GNUPGHOME" python.tar.xz.asc \
-	&& mkdir -p /usr/src \
-	&& tar -xJC /usr/src -f python.tar.xz \
-	&& mv "/usr/src/Python-$PYTHON_VERSION" /usr/src/python \
+	&& mkdir -p /usr/src/python \
+	&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
 	&& rm python.tar.xz \
 	&& apk del .fetch-deps \
 	\
@@ -40,7 +39,9 @@ RUN set -ex \
 		xz-dev \
 		zlib-dev \
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-loadable-sqlite-extensions \
+		--enable-shared \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \
 	&& make install \
 	&& pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
diff --git a/3.6/slim/Dockerfile b/3.6/slim/Dockerfile
index c5328abbd..ac090f891 100644
--- a/3.6/slim/Dockerfile
+++ b/3.6/slim/Dockerfile
@@ -48,7 +48,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-loadable-sqlite-extensions \
+		--enable-shared \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \