diff --git a/Makefile b/Makefile
index 557ad9025..269647714 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ default_target: local
 
 COMMIT_HASH := $(shell git log -1 --pretty=format:"%h"|tail -1)
 VERSION = 0.12.0
-IMAGE_OWNER ?= blakeblackshear
+IMAGE_OWNER ?= ghcr.io/blakeblackshear/frigate
 CURRENT_UID := $(shell id -u)
 CURRENT_GID := $(shell id -g)
 
@@ -16,19 +16,19 @@ build_web:
 	docker buildx build --target web-dist --output web/dist .
 
 amd64:
-	docker buildx build --platform linux/amd64 --tag $(IMAGE_OWNER)/frigate:$(VERSION)-$(COMMIT_HASH) .
+	docker buildx build --platform linux/amd64 --tag $(IMAGE_REPO):$(VERSION)-$(COMMIT_HASH) .
 
 arm64:
-	docker buildx build --platform linux/arm64 --tag $(IMAGE_OWNER)/frigate:$(VERSION)-$(COMMIT_HASH) .
+	docker buildx build --platform linux/arm64 --tag $(IMAGE_REPO):$(VERSION)-$(COMMIT_HASH) .
 
 armv7:
-	docker buildx build --platform linux/arm/v7 --tag $(IMAGE_OWNER)/frigate:$(VERSION)-$(COMMIT_HASH) .
+	docker buildx build --platform linux/arm/v7 --tag $(IMAGE_REPO):$(VERSION)-$(COMMIT_HASH) .
 
 build: version amd64 arm64 armv7
-	docker buildx build --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag $(IMAGE_OWNER)/frigate:$(VERSION)-$(COMMIT_HASH) .
+	docker buildx build --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag $(IMAGE_REPO):$(VERSION)-$(COMMIT_HASH) .
 
 push: build
-	docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag ghcr.io/$(IMAGE_OWNER)/frigate:${GITHUB_REF_NAME}-$(COMMIT_HASH) .
+	docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag $(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH) .
 
 run_tests: frigate
 	docker run --rm --entrypoint=python3 frigate:latest -u -m unittest