diff --git a/Makefile b/Makefile
index c66f6d6c..5561ff87 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ clean:
 
 .PHONY: image/build
 image/build:
-	$(DOCKER) build \
+	$(DOCKER) build 
 		--build-arg bpftracesha=$(BPFTRACESHA) \
 		--build-arg imagenamebase=$(IMAGE_NAME_BASE) \
 		$(IMAGE_BUILD_FLAGS) \
diff --git a/hack/ci-build-image.sh b/hack/ci-build-image.sh
index 4d4dfafb..2f27d309 100755
--- a/hack/ci-build-image.sh
+++ b/hack/ci-build-image.sh
@@ -9,3 +9,4 @@ if [[ ! -z "$TRAVIS_PULL_REQUEST_BRANCH" ]]; then
 fi
 
 $make $makeopts image/build
+$make $makeopts image/build-init
diff --git a/hack/ci-release-image.sh b/hack/ci-release-image.sh
index 077a2bb8..c3d340f0 100755
--- a/hack/ci-release-image.sh
+++ b/hack/ci-release-image.sh
@@ -13,7 +13,7 @@ if [[ ! -z "$TRAVIS_PULL_REQUEST_BRANCH" ]]; then
 fi
 
 if [[ ! -z "$QUAY_TOKEN" ]]; then
-  $docker login -u="fntlnz+travisci" -p="$QUAY_TOKEN" quay.io
+  $docker login -u="iovisor+kubectltracetravisci" -p="$QUAY_TOKEN" quay.io
   $make $makeopts image/push
 fi