diff --git a/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash b/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash
index d241c6a46..51b065ce2 100755
--- a/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash
+++ b/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash
@@ -1,45 +1,40 @@
 #!/bin/bash
-
 set -eu
 
+echo "==> Build environment:"
+env
 
 ARCH=$PROXYSQL_BUILD_ARCH
-
 echo "==> $ARCH architecture detected for package"
 
+echo "==> Cleaning"
 # Delete package if exists
-rm -f "/opt/proxysql/binaries/proxysql_${CURVER}-${PKG_RELEASE}_$ARCH.deb" || true
+rm -f /opt/proxysql/binaries/proxysql_${CURVER}-${PKG_RELEASE}_$ARCH.deb || true
 # Cleanup relic directories from a previously failed build
 rm -f /opt/proxysql/proxysql.ctl /opt/proxysql/proxysql || true
+
 # Clean and build dependancies and source
+echo "==> Building"
 cd /opt/proxysql
-# Patch for Ubuntu 12
-if [ "`grep Ubuntu /etc/issue | awk '{print $2}' | cut -d. -f1`" == "12" ]; then
-	sed -i -e 's/c++11/c++0x/' lib/Makefile
-	sed -i -e 's/c++11/c++0x/' src/Makefile
-        cd /opt/proxysql/deps/re2/
-	mv re2.tar.gz /tmp/
-	wget -O re2.tar.gz https://github.com/sysown/proxysql/raw/v1.3.9/deps/re2/re2-20140304.tgz
-        cd /opt/proxysql
-fi
 if [[ -z ${PROXYSQL_BUILD_TYPE:-} ]] ; then
-  deps_target="build_deps"
-  build_target=""
+	deps_target="build_deps"
+	build_target=""
 else
-  deps_target="build_deps_$PROXYSQL_BUILD_TYPE"
-  build_target="$PROXYSQL_BUILD_TYPE"
+	deps_target="build_deps_$PROXYSQL_BUILD_TYPE"
+	build_target="$PROXYSQL_BUILD_TYPE"
 fi
 ${MAKE} cleanbuild
 ${MAKE} ${MAKEOPT} "${deps_target}"
 
 if [[ -z ${build_target} ]] ; then
-  ${MAKE} ${MAKEOPT}
+	${MAKE} ${MAKEOPT}
 else
-  ${MAKE} ${MAKEOPT} "${build_target}"
+	${MAKE} ${MAKEOPT} "${build_target}"
 fi
-
 touch /opt/proxysql/src/proxysql
-# Prepare package files and build RPM
+
+# Prepare package files and build DEB
+echo "==> Packaging"
 cp /root/ctl/proxysql.ctl /opt/proxysql/proxysql.ctl
 sed -i "s/PKG_VERSION_CURVER/${CURVER}/g" /opt/proxysql/proxysql.ctl
 sed -i "s/PKG_ARCH/${ARCH}/g" /opt/proxysql/proxysql.ctl
@@ -47,10 +42,4 @@ cp /opt/proxysql/src/proxysql /opt/proxysql/
 equivs-build proxysql.ctl
 mv "/opt/proxysql/proxysql_${CURVER}_$ARCH.deb" "./binaries/proxysql_${CURVER}-${PKG_RELEASE}_$ARCH.deb"
 # Cleanup current build
-# Unpatch Ubuntu 12
-if [ "`grep Ubuntu /etc/issue | awk '{print $2}' | cut -d. -f1`" == "12" ]; then
-        sed -i -e 's/c++0x/c++11/' lib/Makefile
-        sed -i -e 's/c++0x/c++11/' src/Makefile
-        mv /tmp/re2.tar.gz /opt/proxysql/deps/re2/
-fi
 rm -f /opt/proxysql/proxysql.ctl /opt/proxysql/proxysql
diff --git a/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash b/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash
index 406274747..bb9268be8 100755
--- a/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash
+++ b/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash
@@ -17,20 +17,21 @@ rm -fr /root/.pki /root/rpmbuild/{BUILDROOT,RPMS,SRPMS,BUILD,SOURCES,tmp} /opt/p
 echo "==> Building"
 cd /opt/proxysql
 if [[ -z ${PROXYSQL_BUILD_TYPE:-} ]] ; then
-  deps_target="build_deps"
-  build_target=""
+	deps_target="build_deps"
+	build_target=""
 else
-  deps_target="build_deps_$PROXYSQL_BUILD_TYPE"
-  build_target="$PROXYSQL_BUILD_TYPE"
+	deps_target="build_deps_$PROXYSQL_BUILD_TYPE"
+	build_target="$PROXYSQL_BUILD_TYPE"
 fi
 ${MAKE} cleanbuild
 ${MAKE} ${MAKEOPT} "${deps_target}"
 
 if [[ -z ${build_target} ]] ; then
-  ${MAKE} ${MAKEOPT}
+	${MAKE} ${MAKEOPT}
 else
-  ${MAKE} ${MAKEOPT} "${build_target}"
+	${MAKE} ${MAKEOPT} "${build_target}"
 fi
+touch /opt/proxysql/src/proxysql
 
 # Prepare package files and build RPM
 echo "==> Packaging"
diff --git a/docker/images/proxysql/rhel-compliant/rhel6/entrypoint/entrypoint.bash b/docker/images/proxysql/rhel-compliant/rhel6/entrypoint/entrypoint.bash
index b541f2e6e..bb9268be8 100755
--- a/docker/images/proxysql/rhel-compliant/rhel6/entrypoint/entrypoint.bash
+++ b/docker/images/proxysql/rhel-compliant/rhel6/entrypoint/entrypoint.bash
@@ -4,9 +4,12 @@ set -eu
 echo "==> Build environment:"
 env
 
+ARCH=$PROXYSQL_BUILD_ARCH
+echo "==> $ARCH architecture detected for package"
+
 echo "==> Cleaning"
 # Delete package if exists
-rm -f /opt/proxysql/binaries/proxysql-${CURVER}-1-${PKG_RELEASE}.x86_64.rpm || true
+rm -f /opt/proxysql/binaries/proxysql-${CURVER}-1-${PKG_RELEASE}.$ARCH.rpm || true
 # Cleanup relic directories from a previously failed build
 rm -fr /root/.pki /root/rpmbuild/{BUILDROOT,RPMS,SRPMS,BUILD,SOURCES,tmp} /opt/proxysql/proxysql /opt/proxysql/proxysql-${CURVER} || true
 
@@ -14,20 +17,21 @@ rm -fr /root/.pki /root/rpmbuild/{BUILDROOT,RPMS,SRPMS,BUILD,SOURCES,tmp} /opt/p
 echo "==> Building"
 cd /opt/proxysql
 if [[ -z ${PROXYSQL_BUILD_TYPE:-} ]] ; then
-  deps_target="build_deps"
-  build_target=""
+	deps_target="build_deps"
+	build_target=""
 else
-  deps_target="build_deps_$PROXYSQL_BUILD_TYPE"
-  build_target="$PROXYSQL_BUILD_TYPE"
+	deps_target="build_deps_$PROXYSQL_BUILD_TYPE"
+	build_target="$PROXYSQL_BUILD_TYPE"
 fi
 ${MAKE} cleanbuild
 ${MAKE} ${MAKEOPT} "${deps_target}"
 
 if [[ -z ${build_target} ]] ; then
-  ${MAKE} ${MAKEOPT}
+	${MAKE} ${MAKEOPT}
 else
-  ${MAKE} ${MAKEOPT} "${build_target}"
+	${MAKE} ${MAKEOPT} "${build_target}"
 fi
+touch /opt/proxysql/src/proxysql
 
 # Prepare package files and build RPM
 echo "==> Packaging"
@@ -41,6 +45,6 @@ tar czvf "proxysql-${CURVER}.tar.gz" proxysql-${CURVER}
 mkdir -p /root/rpmbuild/{RPMS,SRPMS,BUILD,SOURCES,SPECS,tmp}
 mv "/opt/proxysql/proxysql-${CURVER}.tar.gz" /root/rpmbuild/SOURCES
 cd /root/rpmbuild && rpmbuild -ba SPECS/proxysql.spec --define "version ${CURVER}"
-mv "/root/rpmbuild/RPMS/x86_64/proxysql-${CURVER}-1.x86_64.rpm" "/opt/proxysql/binaries/proxysql-${CURVER}-1-${PKG_RELEASE}.x86_64.rpm"
+mv "/root/rpmbuild/RPMS/$ARCH/proxysql-${CURVER}-1.$ARCH.rpm" "/opt/proxysql/binaries/proxysql-${CURVER}-1-${PKG_RELEASE}.$ARCH.rpm"
 # Cleanup current build
 rm -fr /root/.pki /root/rpmbuild/{BUILDROOT,RPMS,SRPMS,BUILD,SOURCES,tmp} /opt/proxysql/proxysql "/opt/proxysql/proxysql-${CURVER}"
diff --git a/docker/images/proxysql/rhel-compliant/rhel7/entrypoint/entrypoint.bash b/docker/images/proxysql/rhel-compliant/rhel7/entrypoint/entrypoint.bash
index ff5f15b8f..18b5f9582 100755
--- a/docker/images/proxysql/rhel-compliant/rhel7/entrypoint/entrypoint.bash
+++ b/docker/images/proxysql/rhel-compliant/rhel7/entrypoint/entrypoint.bash
@@ -1,27 +1,12 @@
 #!/bin/bash
 set -eu
 
-# For troubleshooting...
-# while true; do echo hello; sleep 2; done
-
 echo "==> Build environment:"
 env
 
 ARCH=$PROXYSQL_BUILD_ARCH
 echo "==> $ARCH architecture detected for package"
 
-echo "==> Dirty patching to ensure OS deps are installed"
-
-if [[ -f "/usr/bin/python" ]]  || [[ -h "/usr/bin/python" ]];
-then 
-    echo "==> Installing dependancies for RHEL compliant version 7"
-    yum -y install gnutls-devel libtool || true
-else
-    echo "==> Installing dependancies for RHEL compliant version 8"
-    yum -y install python2 gnutls-devel libtool || true
-    ln -s /usr/bin/python2.7 /usr/bin/python || true
-fi
-
 echo "==> Cleaning"
 # Delete package if exists
 rm -f /opt/proxysql/binaries/proxysql-${CURVER}-1-${PKG_RELEASE}.$ARCH.rpm || true
@@ -32,20 +17,21 @@ rm -fr /root/.pki /root/rpmbuild/{BUILDROOT,RPMS,SRPMS,BUILD,SOURCES,tmp} /opt/p
 echo "==> Building"
 cd /opt/proxysql
 if [[ -z ${PROXYSQL_BUILD_TYPE:-} ]] ; then
-  deps_target="build_deps"
-  build_target=""
+	deps_target="build_deps"
+	build_target=""
 else
-  deps_target="build_deps_$PROXYSQL_BUILD_TYPE"
-  build_target="$PROXYSQL_BUILD_TYPE"
+	deps_target="build_deps_$PROXYSQL_BUILD_TYPE"
+	build_target="$PROXYSQL_BUILD_TYPE"
 fi
 ${MAKE} cleanbuild
 ${MAKE} ${MAKEOPT} "${deps_target}"
 
 if [[ -z ${build_target} ]] ; then
-  ${MAKE} ${MAKEOPT}
+	${MAKE} ${MAKEOPT}
 else
-  ${MAKE} ${MAKEOPT} "${build_target}"
+	${MAKE} ${MAKEOPT} "${build_target}"
 fi
+touch /opt/proxysql/src/proxysql
 
 # Prepare package files and build RPM
 echo "==> Packaging"