diff --git a/Makefile b/Makefile
index 9a485a79f..50d50966a 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,11 @@ endif
 ifeq ($(OS),Darwin)
 	NPROCS := $(shell sysctl -n hw.ncpu)
 endif
-export MAKEOPT=-j ${NPROCS}
+
+# Force to 8 for automatic build
+export MAKEOPT=-j 8
+
+#export MAKEOPT=-j ${NPROCS}
 
 ifeq ($(wildcard /usr/lib/systemd/system), /usr/lib/systemd/system)
 	SYSTEMD=1
@@ -156,7 +160,7 @@ clean:
 	cd src && ${MAKE} clean
 	cd test/tap && ${MAKE} clean
 
-packages: centos6.7 centos6.7-dbg centos7 centos7-dbg centos7-clickhouse centos8 centos8-dbg centos8-clickhouse ubuntu14 ubuntu14-dbg ubuntu16 ubuntu16-dbg ubuntu16-clickhouse ubuntu18 ubuntu18-dbg ubuntu18-clickhouse debian7 debian7-dbg debian8 debian8-dbg debian9 debian9-dbg debian9-clickhouse debian10 debian10-dbg debian10-clickhouse fedora24 fedora24-dbg  fedora24-clickhouse fedora27 fedora27-dbg fedora27-clickhouse fedora28 fedora28-dbg fedora28-clickhouse
+packages: centos7 centos7-dbg centos7-clickhouse centos8 centos8-dbg centos8-clickhouse ubuntu14 ubuntu14-dbg ubuntu16 ubuntu16-dbg ubuntu16-clickhouse ubuntu18 ubuntu18-dbg ubuntu18-clickhouse debian7 debian7-dbg debian8 debian8-dbg debian9 debian9-dbg debian9-clickhouse debian10 debian10-dbg debian10-clickhouse fedora24 fedora24-dbg  fedora24-clickhouse fedora27 fedora27-dbg fedora27-clickhouse fedora28 fedora28-dbg fedora28-clickhouse
 .PHONY: packages
 
 centos5: binaries/proxysql-${CURVER}-1-centos5.x86_64.rpm
@@ -309,7 +313,7 @@ binaries/proxysql-${CURVER}-1-dbg-centos7.x86_64.rpm:
 
 binaries/proxysql-${CURVER}-1-centos8.x86_64.rpm:
 		docker-compose up centos8_build
-		docker-compose rm -f
+		#docker-compose rm -f
 
 binaries/proxysql-${CURVER}-clickhouse-1-centos8.x86_64.rpm:
 		docker-compose up centos8_ch_build
diff --git a/docker/images/proxysql/rhel-compliant/rhel7/entrypoint/entrypoint.bash b/docker/images/proxysql/rhel-compliant/rhel7/entrypoint/entrypoint.bash
index af5c8c0e5..85b8a339c 100755
--- a/docker/images/proxysql/rhel-compliant/rhel7/entrypoint/entrypoint.bash
+++ b/docker/images/proxysql/rhel-compliant/rhel7/entrypoint/entrypoint.bash
@@ -1,11 +1,15 @@
 #!/bin/bash
 set -eu
 
+# For troubleshooting...
+# while true; do echo hello; sleep 2; done
+
 echo "==> Build environment:"
 env
 
 echo "==> Dirty patching to ensure OS deps are installed"
-yum -y install gnutls-devel libtool || true
+yum -y install python2 gnutls-devel libtool || true
+ln -s /usr/bin/python2.7 /usr/bin/python
 
 echo "==> Cleaning"
 # Delete package if exists