diff --git a/Makefile b/Makefile
index f174a6d..f8be8ad 100644
--- a/Makefile
+++ b/Makefile
@@ -117,11 +117,9 @@ else ifeq "$(ARCH)" "s390x"
 endif
 
 # If this is a fake master build, push images to alternative location (pipeline wont consider these images GA candidates)
-ifeq "$(TRAVIS)" "true"
-ifneq "$(MAIN_BRANCH)" "$(SOURCE_BRANCH)"
+ifeq ($(shell [ "$(TRAVIS)" = "true" ] && [ -n $(MAIN_BRANCH) ] && [ -n $(SOURCE_BRANCH) ] && [ "$(MAIN_BRANCH)" != "$(SOURCE_BRANCH)" ] && echo "true"), true)
 	MQ_DELIVERY_REGISTRY_NAMESPACE="master-fake"
 endif
-endif
 
 # LTS_TAG is the tag modifier for an LTS container build
 LTS_TAG=