diff --git a/Jenkinsfile b/Jenkinsfile
index b7e6e0c06bc23118a94143c4f9323c20d540fa77..2c5d6f932c02d3f60c3edee721f7092c8b01acc6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -105,7 +105,6 @@ pipeline {
                     }
                     steps {
                         sh 'mkdir -p /home/ubuntu/bin/'
-                        sh 'make setup-ci'
                         sh 'git clone --single-branch --branch ${KONG_SOURCE} https://github.com/Kong/kong.git ${KONG_SOURCE_LOCATION}'
                         sh 'export RESTY_IMAGE_TAG=7 && make package-kong && make test && make cleanup'
                         sh 'export RESTY_IMAGE_TAG=8 && make package-kong && make test && make cleanup'
@@ -125,7 +124,6 @@ pipeline {
                     }
                     steps {
                         sh 'mkdir -p /home/ubuntu/bin/'
-                        sh 'make setup-ci'
                         sh 'git clone --single-branch --branch ${KONG_SOURCE} https://github.com/Kong/kong.git ${KONG_SOURCE_LOCATION}'
                         sh 'export RESTY_IMAGE_TAG=8 && make package-kong && make test && make cleanup'
                         sh 'export RESTY_IMAGE_TAG=7 && make package-kong && make test && make cleanup'
@@ -146,7 +144,6 @@ pipeline {
                     }
                     steps {
                         sh 'mkdir -p /home/ubuntu/bin/'
-                        sh 'make setup-ci'
                         sh 'git clone --single-branch --branch ${KONG_SOURCE} https://github.com/Kong/kong.git ${KONG_SOURCE_LOCATION}'
                         sh 'export RESTY_IMAGE_TAG=stretch && make package-kong && make test && make cleanup'
                         sh 'export RESTY_IMAGE_TAG=jessie && make package-kong && make test && make cleanup'
@@ -174,7 +171,6 @@ pipeline {
                     }
                     steps {
                         sh 'mkdir -p /home/ubuntu/bin/'
-                        sh 'make setup-ci'
                         sh 'git clone --single-branch --branch ${KONG_SOURCE} https://github.com/Kong/kong.git ${KONG_SOURCE_LOCATION}'
                         sh 'export BUILDX=false RESTY_IMAGE_TAG=bionic && make package-kong && make test && make cleanup'
                         sh 'export CACHE=false UPDATE_CACHE=true RESTY_IMAGE_TAG=xenial DOCKER_MACHINE_ARM64_NAME="jenkins-kong-"`cat /proc/sys/kernel/random/uuid` && make package-kong && make test'
diff --git a/Makefile b/Makefile
index 2372f811012fb08fd6f990ce08afeb34346c5a22..65891ccbc10a892be990323e529f7d72623d75c0 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ KONG_GMP_VERSION ?= `grep KONG_GMP_VERSION $(KONG_SOURCE_LOCATION)/.requirements
 KONG_NETTLE_VERSION ?= `grep KONG_NETTLE_VERSION $(KONG_SOURCE_LOCATION)/.requirements | awk -F"=" '{print $$2}'`
 OPENRESTY_PATCHES ?= 1
 LIBYAML_VERSION ?= 0.2.3
-DOCKER_KONG_VERSION ?= master
+DOCKER_KONG_VERSION ?= 'master'
 DEBUG ?= 0
 
 DOCKER_MACHINE_ARM64_NAME?=docker-machine-arm64-${USER}
diff --git a/fpm-entrypoint.sh b/fpm-entrypoint.sh
index de1db77a6dd7227051f322885457becbdf08692e..d33372e8532380dadb527752a7018ba622fc1588 100755
--- a/fpm-entrypoint.sh
+++ b/fpm-entrypoint.sh
@@ -7,24 +7,27 @@ cd /tmp/build
 FPM_PARAMS=""
 if [ "$RESTY_IMAGE_BASE" == "ubuntu" ] || [ "$RESTY_IMAGE_BASE" == "debian" ]; then
   PACKAGE_TYPE="deb"
-  FPM_PARAMS="-d libpcre3 -d perl"
+  FPM_PARAMS="-d libpcre3 -d perl -d zlibc"
   OUTPUT_FILE_SUFFIX=".${RESTY_IMAGE_TAG}"
 elif [ "$RESTY_IMAGE_BASE" == "centos" ]; then
   PACKAGE_TYPE="rpm"
-  FPM_PARAMS="-d pcre -d perl -d perl-Time-HiRes"
+  FPM_PARAMS="-d pcre -d perl -d perl-Time-HiRes -d zlib"
   OUTPUT_FILE_SUFFIX=".el${RESTY_IMAGE_TAG}"
 elif [ "$RESTY_IMAGE_BASE" == "rhel" ]; then
   PACKAGE_TYPE="rpm"
-  FPM_PARAMS="-d pcre -d perl -d perl-Time-HiRes"
+  FPM_PARAMS="-d pcre -d perl -d perl-Time-HiRes -d zlib"
   OUTPUT_FILE_SUFFIX=".rhel${RESTY_IMAGE_TAG}"
   if [ "$RESTY_IMAGE_TAG" == "7" ]; then
     FPM_PARAMS="$FPM_PARAMS -d hostname"
   fi
 elif [ "$RESTY_IMAGE_BASE" == "amazonlinux" ]; then
   PACKAGE_TYPE="rpm"
-  FPM_PARAMS="-d pcre -d perl -d perl-Time-HiRes"
+  FPM_PARAMS="-d pcre -d perl -d perl-Time-HiRes -d zlibc"
   OUTPUT_FILE_SUFFIX=".aws"
 fi
+if [ "$RESTY_IMAGE_TAG" == "bullseye" ]; then
+  FPM_PARAMS="-d libpcre3 -d perl -d zlib1g-dev"
+fi
 OUTPUT_FILE_SUFFIX="${OUTPUT_FILE_SUFFIX}."$(echo ${BUILDPLATFORM} | awk -F "/" '{ print $2}')
 
 ROCKSPEC_VERSION=`basename /tmp/build/build/usr/local/lib/luarocks/rocks/kong/*`