diff --git a/build.sh b/build.sh
index 85fb544..3b6eec6 100755
--- a/build.sh
+++ b/build.sh
@@ -4,4 +4,4 @@ VARSFILE=$1
 
 ls -la src/$VARSFILE
 
-time docker run -it --rm --name extbuild -e "VARSFILE=$VARSFILE" -v $PWD/src:/src extpythonbuilder
+time docker run -it --rm -e "VARSFILE=$VARSFILE" -v $PWD/src:/src extpythonbuilder
diff --git a/scripts/build.sh b/scripts/build.sh
index 7f6952a..863b5de 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -25,6 +25,7 @@ template /src/debian/control | tee debian/control
 cp /src/debian/compat debian/
 cp /src/debian/rules debian/
 cp /src/Makefile ./
+sed -i -E "s/_OPT_DIR_/${PYTHON_MAJOR}/" Makefile
 
 # build the deb
 time dpkg-buildpackage -us -uc -b
diff --git a/src/Makefile b/src/Makefile
index 6dd46cd..f2bb616 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 PY3_SRC=./cpython/
-PY3_CONFFLAGS=--prefix=$(DESTDIR)/opt/extpython/3.7 --with-ensurepip=install
+PY3_CONFFLAGS=--prefix=$(DESTDIR)/opt/extpython/_OPT_DIR_ --with-ensurepip=install --enable-optimizations
 
 all:
 	cd $(PY3_SRC) && \
diff --git a/src/bionic-2.7.16.sh b/src/bionic-2.7.16.sh
index 10c707f..6d8e0a5 100644
--- a/src/bionic-2.7.16.sh
+++ b/src/bionic-2.7.16.sh
@@ -1,8 +1,7 @@
 #!/bin/bash -eux
 
 export PYTHON_RELEASE=2.7.16
-export PYTHON_MAJOR=2.7.16
-# export PYTHON_TARBALL="https://github.com/python/cpython/archive/v${PYTHON_RELEASE}.tar.gz"
+export PYTHON_MAJOR=2.7
 export PYTHON_TARBALL="http://artifact.scc.net.davepedu.com/repo/tar/cpython/cpython/cpython-${PYTHON_RELEASE}.tar.gz"
 export CPYTHON_DEPS="libssl-dev zlib1g-dev libncurses5-dev libncursesw5-dev \
     libreadline-dev libsqlite3-dev libgdbm-dev libdb5.3-dev libbz2-dev libexpat1-dev liblzma-dev tk-dev libffi-dev"
diff --git a/src/bionic-3.7.3.sh b/src/bionic-3.7.3.sh
index ad12fe1..ec5aa7e 100644
--- a/src/bionic-3.7.3.sh
+++ b/src/bionic-3.7.3.sh
@@ -1,8 +1,11 @@
 #!/bin/bash -eux
 
+# Release is used to select which tarball to download
 export PYTHON_RELEASE=3.7.3
+# Major version no is used in paths and labels (extpython-python${}, /opt/extpython/${}/...)
 export PYTHON_MAJOR=3.7
-# export PYTHON_TARBALL="https://github.com/python/cpython/archive/v${PYTHON_RELEASE}.tar.gz"
+# Tarball download URL
 export PYTHON_TARBALL="http://artifact.scc.net.davepedu.com/repo/tar/cpython/cpython/cpython-${PYTHON_RELEASE}.tar.gz"
+# Deps needed to build this package
 export CPYTHON_DEPS="libssl-dev zlib1g-dev libncurses5-dev libncursesw5-dev \
     libreadline-dev libsqlite3-dev libgdbm-dev libdb5.3-dev libbz2-dev libexpat1-dev liblzma-dev tk-dev libffi-dev"
diff --git a/src/bionic-3.8.0a4.sh b/src/bionic-3.8.0a4.sh
index aa4532f..8bf1d3a 100644
--- a/src/bionic-3.8.0a4.sh
+++ b/src/bionic-3.8.0a4.sh
@@ -1,8 +1,7 @@
 #!/bin/bash -eux
 
 export PYTHON_RELEASE=3.8.0a4
-export PYTHON_MAJOR=3.8.0a4
-# export PYTHON_TARBALL="https://github.com/python/cpython/archive/v${PYTHON_RELEASE}.tar.gz"
+export PYTHON_MAJOR=3.8
 export PYTHON_TARBALL="http://artifact.scc.net.davepedu.com/repo/tar/cpython/cpython/cpython-${PYTHON_RELEASE}.tar.gz"
 export CPYTHON_DEPS="libssl-dev zlib1g-dev libncurses5-dev libncursesw5-dev \
     libreadline-dev libsqlite3-dev libgdbm-dev libdb5.3-dev libbz2-dev libexpat1-dev liblzma-dev tk-dev libffi-dev"