diff --git a/.github/scripts/docker/build_and_push.sh b/.github/scripts/docker/build_and_push.sh
index f569ee3..d3c3f07 100755
--- a/.github/scripts/docker/build_and_push.sh
+++ b/.github/scripts/docker/build_and_push.sh
@@ -10,7 +10,7 @@ elif [ "$arch" = "aarch64" ]; then
 fi
 
 image_base=quay.io/pypa/manylinux_2_28_${arch}
-tag=samwelborn/stempy_wheel_builder_${arch}
+tag=openchemistry/stempy_wheel_builder_${arch}
 
 docker build . --platform=$platform -t $tag --build-arg BASE_IMAGE=$image_base --build-arg ARCH=$arch
 docker push $tag
diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index f685754..621c74c 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -13,8 +13,8 @@ env:
   CIBW_SKIP: "cp36-* pp* *-manylinux_i686 *-musllinux_* *-win32 cp313-*"
 
   # This has some of the software we need pre-installed on it
-  CIBW_MANYLINUX_X86_64_IMAGE: samwelborn/stempy_wheel_builder_x86_64
-  CIBW_MANYLINUX_AARCH64_IMAGE: samwelborn/stempy_wheel_builder_aarch64
+  CIBW_MANYLINUX_X86_64_IMAGE: openchemistry/stempy_wheel_builder_x86_64
+  CIBW_MANYLINUX_AARCH64_IMAGE: openchemistry/stempy_wheel_builder_aarch64
 
   # Need to do some setup before repairing the wheel on linux...
   CIBW_REPAIR_WHEEL_COMMAND_LINUX: bash .github/scripts/repair_command_linux.sh