diff --git a/.github/workflows/events/main-push-event.json b/.github/workflows/events/main-push-event.json
index 66fe49f..bfdd928 100644
--- a/.github/workflows/events/main-push-event.json
+++ b/.github/workflows/events/main-push-event.json
@@ -1,6 +1,6 @@
 {
   "ref": "refs/heads/main",
   "repository": {
-    "full_name": "josephbarnett/cloudzero-agent-validator"
+    "full_name": "cloudzero/cloudzero-agent-validator"
   }
 }
diff --git a/.github/workflows/events/release-event.json b/.github/workflows/events/release-event.json
index 9aa2970..3147781 100644
--- a/.github/workflows/events/release-event.json
+++ b/.github/workflows/events/release-event.json
@@ -1,6 +1,6 @@
 {
   "ref": "refs/tags/v0.9.0",
   "repository": {
-    "full_name": "josephbarnett/cloudzero-agent-validator"
+    "full_name": "cloudzero/cloudzero-agent-validator"
   }
 }
diff --git a/Makefile b/Makefile
index dacd152..d602e0b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 REPO_NAME ?= $(shell basename `git rev-parse --show-toplevel`)
-IMAGE_NAME ?= ghcr.io/josephbarnett/cloudzero-charts/cloudzero-agent-validator
-TAG ?= golang
+IMAGE_NAME ?= ghcr.io/cloudzero/cloudzero-agent-validator/cloudzero-agent-validator
+TAG ?= dev-$(git rev-parse --short HEAD)
 
 # Docker is the default container tool (and buildx buildkit)
 CONTAINER_TOOL ?= docker
@@ -8,7 +8,6 @@ BUILDX_CONTAINER_EXISTS := $(shell $(CONTAINER_TOOL) buildx ls --format "{{.Name
 
 BUILD_TIME ?= $(shell date -u '+%Y-%m-%d_%I:%M:%S%p')
 REVISION ?= $(shell git rev-parse HEAD)
-TAG ?= $(shell git describe --tags 2>/dev/null || true)
 
 # Directories
 # Colors
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6203fa8..a304585 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-# export IMAGE_NAME=ghcr.io/josephbarnett/cloudzero-charts/cloudzero-agent-validator
+# export IMAGE_NAME=ghcr.io/cloudzero/cloudzero-agent-validator/cloudzero-agent-validator
 # export TAG=golang
 # docker buildx build --builder=container --platform linux/amd64,linux/arm64 --push -t ${IMAGE_NAME}:${TAG} -f docker/Dockerfile .
 #