diff --git a/.docker-images b/.docker-images
index 58019909..a93b0396 100644
--- a/.docker-images
+++ b/.docker-images
@@ -2,8 +2,6 @@ images:
   - name: cloudflared
     dockerfile: Dockerfile
     context: .
-    versions:
-    - latest
     registries:
     - name: docker.io/cloudflare
       user: env:DOCKER_USER
diff --git a/Makefile b/Makefile
index 7fd9c8ef..02a703e9 100644
--- a/Makefile
+++ b/Makefile
@@ -49,6 +49,12 @@ else
 	EXECUTABLE_PATH=./cloudflared
 endif
 
+ifeq ($(FLAVOR), centos-7)
+	TARGET_PUBLIC_REPO ?= el7
+else
+	TARGET_PUBLIC_REPO ?= $(FLAVOR)
+endif
+
 .PHONY: all
 all: cloudflared test
 
@@ -75,7 +81,7 @@ test-ssh-server:
 define publish_package
 	for HOST in $(CF_PKG_HOSTS); do \
 		ssh-keyscan -t rsa $$HOST >> ~/.ssh/known_hosts; \
-		scp -4 cloudflared_$(VERSION)_amd64.deb cfsync@$$HOST:/state/cf-pkg/staging/$(1)/$(FLAVOR)/cloudflared/; \
+		scp -4 cloudflared_$(VERSION)_amd64.deb cfsync@$$HOST:/state/cf-pkg/staging/$(1)/$(TARGET_PUBLIC_REPO)/cloudflared/; \
 	done
 endef