diff --git a/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash b/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash
index beabbe7aad..53cb4c3204 100755
--- a/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash
+++ b/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash
@@ -26,7 +26,12 @@ else
 fi
 ${MAKE} cleanbuild
 ${MAKE} ${MAKEOPT} "${deps_target}"
-${MAKE} ${MAKEOPT} "${build_target}"
+
+if [[ -z ${build_target} ]] ; then
+  ${MAKE} ${MAKEOPT}
+else
+  ${MAKE} ${MAKEOPT} "${build_target}"
+fi
 # Prepare package files and build RPM
 cp /root/ctl/proxysql.ctl /opt/proxysql/proxysql.ctl
 sed -i "s/PKG_VERSION_CURVER/${CURVER}/g" /opt/proxysql/proxysql.ctl
diff --git a/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash b/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash
index 567664c570..b541f2e6e7 100755
--- a/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash
+++ b/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash
@@ -22,7 +22,12 @@ else
 fi
 ${MAKE} cleanbuild
 ${MAKE} ${MAKEOPT} "${deps_target}"
-${MAKE} ${MAKEOPT} "${build_target}"
+
+if [[ -z ${build_target} ]] ; then
+  ${MAKE} ${MAKEOPT}
+else
+  ${MAKE} ${MAKEOPT} "${build_target}"
+fi
 
 # Prepare package files and build RPM
 echo "==> Packaging"