diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0db0eb8..b885ab3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,6 +26,12 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1.10.0
+        with:
+          registry: ghcr.io
+          username: pykmsorgadmin
+          password: ${{ secrets.GHCR_PASSWORD }}
       - name: Build
         uses: docker/build-push-action@v2
         with:
@@ -33,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
+          tags: pykmsorg/py-kms:latest,ghcr.io/py-kms-organization/py-kms:latest
       - name: Build
         uses: docker/build-push-action@v2
         with:
@@ -41,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
+          tags: pykmsorg/py-kms:minimal,ghcr.io/py-kms-organization/py-kms:minimal