diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8912b39d17c54a5df0b851c59b10d1bed9ce8fc4..a5141aa7415a0b8bcbcda03be70c412f9d5d7de1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,8 +3,8 @@ include:
   - local: 'images/.utils/gitlab-ci.yaml'
   - local: 'charts/**/.gitlab-ci.yaml'
 stages:
-  - release
   - build
+  - release
 
 
 # Automated month-based releases
diff --git a/Makefile b/Makefile
index c044e1c0b9b962d688d4aae16b80629bc3bdaa5a..25d99e77eb1c8c9d79ce6e227e4b51b4be7cbc1c 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ check-machine: ## Check your local machine setup to be prepared for the installa
 
 .PHONY: cli
 cli: ## Install koolbox CLI (Contains all tools used in this project)
-	cd ./images/koolbox && make install
+	cd ./images/koolbox && make install REGISTRY_HOST=$(REGISTRY_HOST) USERNAME=shivering-isles
 
 .PHONY: cli-config
 cli-config: ## Configure koolbox CLI (To setup terraform values as well was tokens)
diff --git a/images/.utils/container-build.mk b/images/.utils/container-build.mk
index f786f842b3cff224db61555cee42a3c12b4b4dab..316321b83ce9025c011ce414ccde8024f8992b16 100644
--- a/images/.utils/container-build.mk
+++ b/images/.utils/container-build.mk
@@ -29,12 +29,16 @@ SHELL=/bin/bash
 DOCKER_BUILD_CONTEXT=.
 DOCKER_FILE_PATH=Dockerfile
 
-.PHONY: pre-build docker-build post-build build release patch-release minor-release major-release tag check-status check-release showver \
+.PHONY: preflight pre-build docker-build post-build build release patch-release minor-release major-release tag check-status check-release showver \
 	push pre-push do-push post-push
 
+preflight:
+	# Check for required tools
+	command -v podman > /dev/null
+
 build: pre-build docker-build post-build ## build and tag container
 
-pre-build:
+pre-build: preflight
 
 
 post-build:
@@ -49,8 +53,7 @@ post-push:
 
 docker-build: .release
 	podman build $(DOCKER_BUILD_ARGS) -t $(IMAGE):$(VERSION) $(DOCKER_BUILD_CONTEXT) -f $(DOCKER_FILE_PATH)
-	echo podman tag $(IMAGE):$(VERSION) $(IMAGE):latest ;\
-	podman tag $(IMAGE):$(VERSION) $(IMAGE):latest ; \
+	podman tag $(IMAGE):$(VERSION) $(IMAGE):latest
 
 .release:
 	@echo "release=0.0.0" > .release