diff --git a/dev.toml b/dev.toml
index 1d81513..1ab5223 100644
--- a/dev.toml
+++ b/dev.toml
@@ -5,10 +5,10 @@ tags = ["dev", "binaries", "aarch64"]
 builder = "aarch64-builder"
 version = "1.17.0"
 auto_increment_version = false
-image_name = "binaries"
+image_name = "komodo-binaries"
 image_tag = "dev-aarch64"
 links = [
-  "https://git.komo.do/moghtech/-/packages/container/binaries"
+  "https://github.com/moghtech/komodo/pkgs/container/komodo-binaries"
 ]
 repo = "moghtech/komodo"
 branch = "1.17.0"
@@ -26,10 +26,10 @@ tags = ["dev", "binaries", "x86_64"]
 builder = "x86_64-builder"
 version = "1.17.0"
 auto_increment_version = false
-image_name = "binaries"
+image_name = "komodo-binaries"
 image_tag = "dev-x86_64"
 links = [
-  "https://git.komo.do/moghtech/-/packages/container/binaries"
+  "https://github.com/moghtech/komodo/pkgs/container/komodo-binaries"
 ]
 repo = "moghtech/komodo"
 branch = "1.17.0"
@@ -50,7 +50,7 @@ auto_increment_version = false
 image_name = "komodo"
 image_tag = "dev"
 links = [
-  "https://git.komo.do/moghtech/-/packages/container/core"
+  "https://github.com/moghtech/komodo/pkgs/container/komodo"
 ]
 repo = "moghtech/komodo"
 branch = "1.17.0"
@@ -63,8 +63,8 @@ extra_args = [
   "--builder builder"
 ]
 build_args = """
-  BINARIES_IMAGE = ghcr.io/moghtech/binaries:latest-dev
-  FRONTEND_IMAGE = ghcr.io/moghtech/frontend:latest-dev
+  BINARIES_IMAGE = ghcr.io/moghtech/komodo-binaries:latest-dev
+  FRONTEND_IMAGE = ghcr.io/moghtech/komodo-frontend:latest-dev
 """
 
 ##
@@ -76,10 +76,10 @@ tags = ["dev", "frontend"]
 builder = "local"
 version = "1.17.0"
 auto_increment_version = false
-image_name = "frontend"
+image_name = "komodo-frontend"
 image_tag = "dev"
 links = [
-  "https://git.komo.do/moghtech/-/packages/container/frontend"
+  "https://github.com/moghtech/komodo/pkgs/container/komodo-frontend"
 ]
 repo = "moghtech/komodo"
 branch = "1.17.0"
@@ -97,10 +97,10 @@ tags = ["dev", "periphery"]
 builder = "local"
 version = "1.17.0"
 auto_increment_version = false
-image_name = "periphery"
+image_name = "komodo-periphery"
 image_tag = "dev"
 links = [
-  "https://git.komo.do/moghtech/-/packages/container/core"
+  "https://github.com/moghtech/komodo/pkgs/container/komodo-periphery"
 ]
 repo = "moghtech/komodo"
 branch = "1.17.0"
@@ -113,7 +113,7 @@ extra_args = [
   "--builder builder"
 ]
 build_args = """
-  BINARIES_IMAGE = ghcr.io/moghtech/binaries:latest-dev
+  BINARIES_IMAGE = ghcr.io/moghtech/komodo-binaries:latest-dev
 """
 
 ##
@@ -128,7 +128,7 @@ repo = "moghtech/build"
 on_clone.command = """
 bash ./upload-binaries.sh \
   [[KOMODO_DEV_TAG]] \
-  ghcr.io/moghtech/binaries:latest-dev \
+  ghcr.io/moghtech/komodo-binaries:latest-dev \
   [[KOMODO_DEV_VERSION]] \
   [[KOMODO_GIT_TOKEN]]
 """
diff --git a/release.toml b/release.toml
index 14a123d..aa5af4a 100644
--- a/release.toml
+++ b/release.toml
@@ -3,14 +3,15 @@ name = "komodo-binaries-aarch64"
 tags = ["release", "binaries", "aarch64"]
 [build.config]
 builder = "aarch64-builder"
-version = "1.16.12"
+version = "1.17.0"
 auto_increment_version = false
 image_name = "komodo-binaries"
 image_tag = "aarch64"
-repo = "mbecker20/komodo"
+repo = "moghtech/komodo"
 dockerfile_path = "bin/binaries.Dockerfile"
 image_registry.domain = "ghcr.io"
 image_registry.account = "mbecker20"
+image_registry.organization = "moghtech"
 
 ##
 
@@ -19,14 +20,15 @@ name = "komodo-binaries-x86_64"
 tags = ["release", "binaries", "x86_64"]
 [build.config]
 builder = "x86_64-builder"
-version = "1.16.12"
+version = "1.17.0"
 auto_increment_version = false
 image_name = "komodo-binaries"
 image_tag = "x86_64"
-repo = "mbecker20/komodo"
+repo = "moghtech/komodo"
 dockerfile_path = "bin/binaries.Dockerfile"
 image_registry.domain = "ghcr.io"
 image_registry.account = "mbecker20"
+image_registry.organization = "moghtech"
 
 ##
 
@@ -41,13 +43,14 @@ Must run the following command on host to create the builder:
 tags = ["release", "core"]
 [build.config]
 builder = "local"
-version = "1.16.12"
+version = "1.17.0"
 auto_increment_version = false
 image_name = "komodo"
-repo = "mbecker20/komodo"
+repo = "moghtech/komodo"
 dockerfile_path = "bin/core/multi-arch.Dockerfile"
 image_registry.domain = "ghcr.io"
 image_registry.account = "mbecker20"
+image_registry.organization = "moghtech"
 extra_args = [
   "--platform linux/amd64,linux/arm64",
   "--builder builder"
@@ -60,13 +63,13 @@ name = "komodo-frontend"
 tags = ["release", "frontend"]
 [build.config]
 builder = "x86_64-builder"
-version = "1.16.12"
+version = "1.17.0"
 auto_increment_version = false
-image_name = "komodo-frontend"
-repo = "mbecker20/komodo"
+repo = "moghtech/komodo"
 dockerfile_path = "frontend/Dockerfile"
 image_registry.domain = "ghcr.io"
 image_registry.account = "mbecker20"
+image_registry.organization = "moghtech"
 
 ##
 
@@ -81,13 +84,13 @@ Must run the following command to create the builder:
 tags = ["release", "periphery"]
 [build.config]
 builder = "local"
-version = "1.16.12"
+version = "1.17.0"
 auto_increment_version = false
-image_name = "periphery"
-repo = "mbecker20/komodo"
+repo = "moghtech/komodo"
 dockerfile_path = "bin/periphery/multi-arch.Dockerfile"
 image_registry.domain = "ghcr.io"
 image_registry.account = "mbecker20"
+image_registry.organization = "moghtech"
 extra_args = [
   "--platform linux/amd64,linux/arm64",
   "--builder builder"
@@ -101,12 +104,12 @@ tags = ["release", "binaries"]
 [repo.config]
 builder = "local"
 git_provider = "git.komo.do"
-repo = "komodo/build"
+repo = "moghtech/build"
 on_clone.command = """
 bash ./upload-binaries.sh \
-  release \
-  ghcr.io/mbecker20/komodo-binaries:latest \
-  [[KOMODO_VERSION]] \
+  [[KOMODO_RELEASE_TAG]] \
+  ghcr.io/moghtech/komodo-binaries:latest \
+  [[KOMODO_RELEASE_VERSION]] \
   [[KOMODO_GIT_TOKEN]]
 """