diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6ca2bb42..eb26297c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,12 +27,12 @@ jobs:
       - name: Install yj
         uses: buildpacks/github-actions/setup-tools@v5.1.0
       - id: login
-        name: "Login to public ECR"
+        name: "Login to Docker Hub"
         uses: docker/login-action@v2
         with:
-          registry: public.ecr.aws
-          username: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          registry: docker.io
+          username: ${{ secrets.DOCKER_HUB_USER }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
         env:
           AWS_REGION: us-east-1
       - id: install-musl-tools
diff --git a/buildpacks/jvm-function-invoker/buildpack.toml b/buildpacks/jvm-function-invoker/buildpack.toml
index e555813e..7f5bda35 100644
--- a/buildpacks/jvm-function-invoker/buildpack.toml
+++ b/buildpacks/jvm-function-invoker/buildpack.toml
@@ -29,4 +29,4 @@ url = "https://repo1.maven.org/maven2/com/salesforce/functions/sf-fx-runtime-jav
 sha256 = "b8e17b6ee9889304cbd07958f86ac067cb58c7f6bdd324a87133d377f670adb5"
 [metadata.release]
 [metadata.release.docker]
-repository = "public.ecr.aws/heroku-buildpacks/heroku-jvm-function-invoker-buildpack"
+repository = "docker.io/heroku/buildpack-jvm-function-invoker"
diff --git a/buildpacks/jvm/buildpack.toml b/buildpacks/jvm/buildpack.toml
index 08416c54..566ab273 100644
--- a/buildpacks/jvm/buildpack.toml
+++ b/buildpacks/jvm/buildpack.toml
@@ -29,4 +29,4 @@ url = "https://repo1.maven.org/maven2/com/heroku/agent/heroku-java-metrics-agent
 sha256 = "9a718680e4a93f93a8755b20fb21cc541e5c2692acc9da27c667530f48a716db"
 [metadata.release]
 [metadata.release.docker]
-repository = "public.ecr.aws/heroku-buildpacks/heroku-jvm-buildpack"
+repository = "docker.io/heroku/buildpack-jvm"
diff --git a/buildpacks/maven/buildpack.toml b/buildpacks/maven/buildpack.toml
index f838c853..6af40630 100644
--- a/buildpacks/maven/buildpack.toml
+++ b/buildpacks/maven/buildpack.toml
@@ -41,4 +41,4 @@ url = "https://lang-jvm.s3.us-east-1.amazonaws.com/maven-3.3.9.tar.gz"
 sha256 = "72e5a073cd1acb8925a55366a37268d28a5bdde76d4cda4888364068472aa46e"
 [metadata.release]
 [metadata.release.docker]
-repository = "public.ecr.aws/heroku-buildpacks/heroku-maven-buildpack"
+repository = "docker.io/heroku/buildpack-maven"
diff --git a/buildpacks/sbt/buildpack.toml b/buildpacks/sbt/buildpack.toml
index eed1ba4e..56f19f06 100644
--- a/buildpacks/sbt/buildpack.toml
+++ b/buildpacks/sbt/buildpack.toml
@@ -23,3 +23,6 @@ id = "heroku-22"
 
 [[stacks]]
 id = "*"
+
+[metadata.release.docker]
+repository = "docker.io/heroku/buildpack-sbt"
diff --git a/meta-buildpacks/java-function/buildpack.toml b/meta-buildpacks/java-function/buildpack.toml
index 8d45704d..35b817c9 100644
--- a/meta-buildpacks/java-function/buildpack.toml
+++ b/meta-buildpacks/java-function/buildpack.toml
@@ -27,4 +27,4 @@ version = "0.6.7"
 [metadata]
 [metadata.release]
 [metadata.release.docker]
-repository = "public.ecr.aws/heroku-buildpacks/heroku-java-function-buildpack"
+repository = "docker.io/heroku/buildpack-java-function"
diff --git a/meta-buildpacks/java/buildpack.toml b/meta-buildpacks/java/buildpack.toml
index 51f59dc1..3c6c9cf7 100644
--- a/meta-buildpacks/java/buildpack.toml
+++ b/meta-buildpacks/java/buildpack.toml
@@ -29,4 +29,4 @@ optional = true
 [metadata]
 [metadata.release]
 [metadata.release.docker]
-repository = "public.ecr.aws/heroku-buildpacks/heroku-java-buildpack"
+repository = "docker.io/heroku/buildpack-java"
diff --git a/meta-buildpacks/scala/buildpack.toml b/meta-buildpacks/scala/buildpack.toml
index 46540abe..f9707ea9 100644
--- a/meta-buildpacks/scala/buildpack.toml
+++ b/meta-buildpacks/scala/buildpack.toml
@@ -29,4 +29,4 @@ optional = true
 [metadata]
 [metadata.release]
 [metadata.release.docker]
-repository = "public.ecr.aws/heroku-buildpacks/heroku-scala-buildpack"
+repository = "docker.io/heroku/buildpack-scala"