diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b885ab3..659ea87 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -39,7 +39,7 @@ jobs:
           file: ./docker/docker-py3-kms/Dockerfile
           platforms: linux/amd64,linux/386,linux/arm64/v8,linux/arm/v7,linux/arm/v6
           push: true
-          tags: pykmsorg/py-kms:latest,ghcr.io/py-kms-organization/py-kms:latest
+          tags: pykmsorg/py-kms:python3,ghcr.io/py-kms-organization/py-kms:python3
       - name: Build
         uses: docker/build-push-action@v2
         with:
@@ -47,4 +47,4 @@ jobs:
           file: ./docker/docker-py3-kms-minimal/Dockerfile
           platforms: linux/amd64,linux/386,linux/arm64/v8,linux/arm/v7,linux/arm/v6
           push: true
-          tags: pykmsorg/py-kms:minimal,ghcr.io/py-kms-organization/py-kms:minimal
+          tags: pykmsorg/py-kms:latest,ghcr.io/py-kms-organization/py-kms:latest,pykmsorg/py-kms:minimal,ghcr.io/py-kms-organization/py-kms:minimal