diff --git a/Makefile b/Makefile
index 82638841e601..65891ccbc10a 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 ?= 'release/2.0.4'
+DOCKER_KONG_VERSION ?= 'master'
 DEBUG ?= 0
 
 DOCKER_MACHINE_ARM64_NAME?=docker-machine-arm64-${USER}
diff --git a/test/build_container.sh b/test/build_container.sh
index 0fbc2869e035..257e6cf11c61 100755
--- a/test/build_container.sh
+++ b/test/build_container.sh
@@ -6,29 +6,28 @@ rm -rf docker-kong || true
 git clone --single-branch --branch $DOCKER_KONG_VERSION https://github.com/Kong/docker-kong.git docker-kong
 
 if [ "$RESTY_IMAGE_BASE" == "ubuntu" ] || [ "$RESTY_IMAGE_BASE" == "debian" ]; then
-  cp output/*${RESTY_IMAGE_TAG}.amd64.deb docker-kong/ubuntu/empty-kong.deb
+  cp output/*${RESTY_IMAGE_TAG}.amd64.deb docker-kong/ubuntu/kong
   BUILD_DIR="ubuntu"
 elif [ "$RESTY_IMAGE_BASE" == "alpine" ]; then
-  cp output/*.amd64.apk.tar.gz docker-kong/alpine/empty-kong.tar.gz
+  cp output/*.amd64.apk.tar.gz docker-kong/alpine/kong
   BUILD_DIR="alpine"
 elif [ "$RESTY_IMAGE_BASE" == "centos" ] || [ "$RESTY_IMAGE_BASE" == "amazonlinux" ]; then
-  cp output/*.amd64.rpm docker-kong/centos/empty-kong.rpm
+  cp output/*.amd64.rpm docker-kong/centos/kong
   BUILD_DIR="centos"
 elif [ "$RESTY_IMAGE_BASE" == "rhel" ]; then
-  cp output/*.rhel${RESTY_IMAGE_TAG}.amd64.rpm docker-kong/rhel/empty-kong.rpm
+  cp output/*.rhel${RESTY_IMAGE_TAG}.amd64.rpm docker-kong/rhel/kong
   BUILD_DIR="rhel"
 else
   exit 1
 fi
 
-sed -i 's/^FROM .*/FROM '${RESTY_IMAGE_BASE}:${RESTY_IMAGE_TAG}'/' docker-kong/${BUILD_DIR}/Dockerfile
-
-exit 123
-
 pushd docker-kong/${BUILD_DIR}
     docker build -t $KONG_TEST_IMAGE_NAME \
     --no-cache \
-    --build-arg ASSET=local .
+    --build-arg LOCAL_KONG_PACKAGE=kong \
+    --build-arg RESTY_IMAGE_BASE=$RESTY_IMAGE_BASE \
+    --build-arg RESTY_IMAGE_TAG=$RESTY_IMAGE_TAG \
+    --build-arg ASSET_LOCATION=local .
 popd
 
 rm -rf docker-kong || true
\ No newline at end of file