diff --git a/tools/make/env.mk b/tools/make/env.mk
index 700d6cd..5dcd7b7 100644
--- a/tools/make/env.mk
+++ b/tools/make/env.mk
@@ -7,7 +7,9 @@
 HELM_VERSION ?= v0.0.3
 
 # Docker repo
-REGISTRY ?= docker.io/linuxsuren
+REGISTRY ?= docker.io
+
+REGISTRY_NAMESPACE ?= linuxsuren
 
 # Set image tools
 IMAGE_TOOL ?= docker
diff --git a/tools/make/helm.mk b/tools/make/helm.mk
index 7c287f6..bf43a2e 100644
--- a/tools/make/helm.mk
+++ b/tools/make/helm.mk
@@ -5,7 +5,7 @@
 include tools/make/env.mk
 
 
-OCI_REGISTRY ?= oci://${REGISTRY}
+OCI_REGISTRY ?= oci://${REGISTRY}/${REGISTRY_NAMESPACE}
 CHART_NAME ?= api-testing
 CHART_VERSION ?= ${HELM_VERSION}
 
diff --git a/tools/make/image.mk b/tools/make/image.mk
index 2158447..62091af 100644
--- a/tools/make/image.mk
+++ b/tools/make/image.mk
@@ -9,6 +9,7 @@ include tools/make/env.mk
 IMAGES_DIR ?= $(wildcard ${ROOT_DIR}tools/docker/*)
 # Determine images names by stripping out the dir names
 IMAGES ?= api-testing
+IMAGE_NAME ?= ${REGISTRY}/${REGISTRY_NAMESPACE}/${IMAGES}:${TAG}
 
 ifeq (${IMAGES},)
   $(error Could not determine IMAGES, set ROOT_DIR or run in source dir)
@@ -24,14 +25,14 @@ image.build.%:
 	@$(LOG_TARGET)
 	@$(call log, "Building image $(GOOS)-$(GOARCH) $(IMAGES):$(TAG)")
 	${IMAGE_TOOL} build -f $(ROOT_DIR)/Dockerfile \
-			-t ${REGISTRY}/${IMAGES}:${TAG} . \
+			-t ${IMAGE_NAME} . \
     		--build-arg GOPROXY=${GOPROXY} \
     		--build-arg VERSION=$(TAG)
 
 .PHONY: run.image
 run.image:
 	@$(LOG_TARGET)
-	${IMAGE_TOOL} run -p 7070:7070 -p 8080:8080 ${REGISTRY}/${IMAGES}:${TAG}
+	${IMAGE_TOOL} run -p 7070:7070 -p 8080:8080 ${IMAGE_NAME}
 
 ##@ Image