diff --git a/Makefile b/Makefile
index e6e5bbd..fcd75d3 100644
--- a/Makefile
+++ b/Makefile
@@ -34,11 +34,11 @@ BUILD_REPO_NAME := labkey/$(BUILD_DISTRIBUTION)
 BUILD_REMOTE_REPO := $(BUILD_REPO_URI)/$(BUILD_REPO_NAME)
 
 BUILD_LOCAL_TAG ?= $(BUILD_REPO_NAME):$(BUILD_VERSION)
-BUILD_REMOTE_TAG := $(BUILD_REMOTE_REPO):$(BUILD_VERSION)
+BUILD_REMOTE_TAG ?= $(BUILD_REMOTE_REPO):$(BUILD_VERSION)
 
 ifeq (1,$(DEBUG))
   BUILD_LOCAL_TAG := $(addsuffix -debug,$(BUILD_LOCAL_TAG))
-  BUILD_REMOTE_TAG := $(addsuffix -debug,$(BUILD_REMOTE_TAG))
+  BUILD_REMOTE_TAG ?= $(addsuffix -debug,$(BUILD_REMOTE_TAG))
 endif
 
 define tc