diff --git a/docker-compose.yml b/docker-compose.yml
index 931ef69ad..b5a16e49b 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -31,9 +31,10 @@ services:
     image: proxysql/packaging:build-centos6.7
     volumes:
       - ./docker/images/proxysql/rhel-compliant/rpmmacros/:/root/
-      - ./docker/images/proxysql/rhel-compliant/entrypoint/:/opt/entrypoint/
+      - ./docker/images/proxysql/rhel-compliant/rhel6/entrypoint/:/opt/entrypoint/
       - ./:/opt/proxysql/
     environment:
+      - APPLY_PATCH=rhel6
       - MAKE
       - MAKEOPT
       - CURVER
@@ -44,9 +45,10 @@ services:
     image: proxysql/packaging:build-centos6.7
     volumes:
       - ./docker/images/proxysql/rhel-compliant/rpmmacros/:/root/
-      - ./docker/images/proxysql/rhel-compliant/entrypoint/:/opt/entrypoint/
+      - ./docker/images/proxysql/rhel-compliant/rhel6/entrypoint/:/opt/entrypoint/
       - ./:/opt/proxysql/
     environment:
+      - APPLY_PATCH=rhel6
       - MAKE
       - MAKEOPT
       - CURVER
diff --git a/docker/images/proxysql/rhel-compliant/rhel6/entrypoint/entrypoint.bash b/docker/images/proxysql/rhel-compliant/rhel6/entrypoint/entrypoint.bash
new file mode 100755
index 000000000..9c4af5e35
--- /dev/null
+++ b/docker/images/proxysql/rhel-compliant/rhel6/entrypoint/entrypoint.bash
@@ -0,0 +1,54 @@
+#!/bin/bash
+set -eu
+
+echo "==> Build environment:"
+env
+
+echo "==> Dirty patching to ensure OS deps are installed"
+
+yum -y install gnutls-devel libtool || true
+yum -y install epel-release
+sed -i "s/mirrorlist=https/mirrorlist=http/" /etc/yum.repos.d/epel.repo
+yum -y install http://repo.okay.com.mx/centos/6/x86_64/release/okay-release-1-1.noarch.rpm
+yum -y upgrade automake autoconf
+
+echo "==> Cleaning"
+# Delete package if exists
+rm -f /opt/proxysql/binaries/proxysql-${CURVER}-1-${PKG_RELEASE}.x86_64.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
+
+# Clean and build dependancies and source
+echo "==> Building"
+cd /opt/proxysql
+if [[ -z ${PROXYSQL_BUILD_TYPE:-} ]] ; then
+  deps_target="build_deps"
+  build_target=""
+else
+  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}
+else
+  ${MAKE} ${MAKEOPT} "${build_target}"
+fi
+
+# Prepare package files and build RPM
+echo "==> Packaging"
+mkdir -p proxysql/usr/bin proxysql/etc
+cp src/proxysql proxysql/usr/bin/
+cp -a etc proxysql
+mkdir -p proxysql/usr/share/proxysql/tools
+cp -a tools/proxysql_galera_checker.sh tools/proxysql_galera_writer.pl proxysql/usr/share/proxysql/tools
+mv proxysql "proxysql-${CURVER}"
+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"
+# Cleanup current build
+rm -fr /root/.pki /root/rpmbuild/{BUILDROOT,RPMS,SRPMS,BUILD,SOURCES,tmp} /opt/proxysql/proxysql "/opt/proxysql/proxysql-${CURVER}"