diff --git a/docker/docker-py3-kms-minimal/multi-arch-manifest-latest.yaml b/docker/docker-py3-kms-minimal/multi-arch-manifest-latest.yaml
index 3b1745d..9747b43 100644
--- a/docker/docker-py3-kms-minimal/multi-arch-manifest-latest.yaml
+++ b/docker/docker-py3-kms-minimal/multi-arch-manifest-latest.yaml
@@ -1,20 +1,20 @@
-image: realsimonmicro/py-kms-multiarch:latest
+image: pykmsorg/py-kms:latest
 manifests:
-  - image: realsimonmicro/py-kms-multiarch:minimal-amd64
+  - image: pykmsorg/py-kms:minimal-amd64
     platform:
       architecture: amd64
       os: linux
-  - image: realsimonmicro/py-kms-multiarch:minimal-arm32v6
+  - image: pykmsorg/py-kms:minimal-arm32v6
     platform:
       architecture: arm
       os: linux
       variant: v6
-  - image: realsimonmicro/py-kms-multiarch:minimal-arm32v7
+  - image: pykmsorg/py-kms:minimal-arm32v7
     platform:
       architecture: arm
       os: linux
       variant: v7
-  - image: realsimonmicro/py-kms-multiarch:minimal-arm64v8
+  - image: pykmsorg/py-kms:minimal-arm64v8
     platform:
       architecture: arm64
       os: linux
diff --git a/docker/docker-py3-kms-minimal/multi-arch-manifest-minimal.yaml b/docker/docker-py3-kms-minimal/multi-arch-manifest-minimal.yaml
index 3dd3427..a3daff2 100644
--- a/docker/docker-py3-kms-minimal/multi-arch-manifest-minimal.yaml
+++ b/docker/docker-py3-kms-minimal/multi-arch-manifest-minimal.yaml
@@ -1,20 +1,20 @@
-image: realsimonmicro/py-kms-multiarch:minimal
+image: pykmsorg/py-kms:minimal
 manifests:
-  - image: realsimonmicro/py-kms-multiarch:minimal-amd64
+  - image: pykmsorg/py-kms:minimal-amd64
     platform:
       architecture: amd64
       os: linux
-  - image: realsimonmicro/py-kms-multiarch:minimal-arm32v6
+  - image: pykmsorg/py-kms:minimal-arm32v6
     platform:
       architecture: arm
       os: linux
       variant: v6
-  - image: realsimonmicro/py-kms-multiarch:minimal-arm32v7
+  - image: pykmsorg/py-kms:minimal-arm32v7
     platform:
       architecture: arm
       os: linux
       variant: v7
-  - image: realsimonmicro/py-kms-multiarch:minimal-arm64v8
+  - image: pykmsorg/py-kms:minimal-arm64v8
     platform:
       architecture: arm64
       os: linux
diff --git a/docker/docker-py3-kms/multi-arch-manifest-python3.yaml b/docker/docker-py3-kms/multi-arch-manifest-python3.yaml
index 5e3b9a5..ede1020 100644
--- a/docker/docker-py3-kms/multi-arch-manifest-python3.yaml
+++ b/docker/docker-py3-kms/multi-arch-manifest-python3.yaml
@@ -1,20 +1,20 @@
-image: realsimonmicro/py-kms-multiarch:python3
+image: pykmsorg/py-kms:python3
 manifests:
-  - image: realsimonmicro/py-kms-multiarch:python3-amd64
+  - image: pykmsorg/py-kms:python3-amd64
     platform:
       architecture: amd64
       os: linux
-  - image: realsimonmicro/py-kms-multiarch:python3-arm32v6
+  - image: pykmsorg/py-kms:python3-arm32v6
     platform:
       architecture: arm
       os: linux
       variant: v6
-  - image: realsimonmicro/py-kms-multiarch:python3-arm32v7
+  - image: pykmsorg/py-kms:python3-arm32v7
     platform:
       architecture: arm
       os: linux
       variant: v7
-  - image: realsimonmicro/py-kms-multiarch:python3-arm64v8
+  - image: pykmsorg/py-kms:python3-arm64v8
     platform:
       architecture: arm64
       os: linux