diff --git a/maestro/registration/Makefile b/maestro/registration/Makefile
index d62b33184..700006415 100644
--- a/maestro/registration/Makefile
+++ b/maestro/registration/Makefile
@@ -4,11 +4,11 @@ $(shell ../../templatize.sh $(DEPLOY_ENV) config.tmpl.mk config.mk)
 include config.mk
 
 deploy:
-	@if ! kubectl get service maestro -n maestro > /dev/null 2>&1; then \
-		echo "Error: Service 'maestro' not found in namespace 'maestro'"; \
+	@if ! kubectl get service maestro -n ${MAESTRO_NAMESPACE_NAME} > /dev/null 2>&1; then \
+		echo "Error: Service 'maestro' not found in namespace '${CONSUMER_NAME}'"; \
 		exit 1; \
 	fi
 	helm upgrade --install ${CONSUMER_NAME} ./helm \
-		--namespace maestro \
+		--namespace ${MAESTRO_NAMESPACE_NAME} \
 		--set consumerName=${CONSUMER_NAME}
 .PHONY: deploy
diff --git a/maestro/registration/config.tmpl.mk b/maestro/registration/config.tmpl.mk
index 8918876a7..020b96006 100644
--- a/maestro/registration/config.tmpl.mk
+++ b/maestro/registration/config.tmpl.mk
@@ -1 +1,2 @@
 CONSUMER_NAME ?= {{ .maestroConsumerName }}
+MAESTRO_NAMESPACE_NAME ?= {{ .maestroServerNamespace }}