diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 174c188..7487294 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -46,12 +46,18 @@ jobs:
           make build-docker
           docker image ls
           echo "$DOCKER_PASS" | docker login --username "$DOCKER_USER" --password-stdin
+          echo "$DOCKER_GHCR_PASS" | docker login ghcr.io --username "$DOCKER_GHCR_USER" --password-stdin
           docker push --all-tags gotify/server
           docker push --all-tags gotify/server-arm7
           docker push --all-tags gotify/server-arm64
+          docker push --all-tags ghcr.io/gotify/server
+          docker push --all-tags ghcr.io/gotify/server-arm7
+          docker push --all-tags ghcr.io/gotify/server-arm64
         env:
           DOCKER_USER: ${{ secrets.DOCKER_USER }}
           DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
+          DOCKER_GHCR_USER: ${{ secrets.DOCKER_GHCR_USER }}
+          DOCKER_GHCR_PASS: ${{ secrets.DOCKER_GHCR_PASS }}
       - if: startsWith(github.ref, 'refs/tags/v')
         uses: svenstaro/upload-release-action@v2
         with:
diff --git a/Makefile b/Makefile
index 4eb8a87..c81b5bd 100644
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,10 @@ build-docker-amd64: require-version
 		docker build \
 		-t gotify/server:latest \
 		-t gotify/server:${VERSION} \
-		-t gotify/server:$(shell echo $(VERSION) | cut -d '.' -f -2) .
+		-t gotify/server:$(shell echo $(VERSION) | cut -d '.' -f -2) \
+		-t ghcr.io/gotify/server:latest \
+		-t ghcr.io/gotify/server:${VERSION} \
+		-t ghcr.io/gotify/server:$(shell echo $(VERSION) | cut -d '.' -f -2) .
 	rm ${DOCKER_DIR}gotify-app
 
 build-docker-arm-7: require-version
@@ -83,7 +86,10 @@ build-docker-arm-7: require-version
 		docker build -f Dockerfile.armv7 \
 		-t gotify/server-arm7:latest \
 		-t gotify/server-arm7:${VERSION} \
-		-t gotify/server-arm7:$(shell echo $(VERSION) | cut -d '.' -f -2) .
+		-t gotify/server-arm7:$(shell echo $(VERSION) | cut -d '.' -f -2) \
+		-t ghcr.io/gotify/server-arm7:latest \
+		-t ghcr.io/gotify/server-arm7:${VERSION} \
+		-t ghcr.io/gotify/server-arm7:$(shell echo $(VERSION) | cut -d '.' -f -2) .
 	rm ${DOCKER_DIR}gotify-app
 
 build-docker-arm64: require-version
@@ -92,7 +98,10 @@ build-docker-arm64: require-version
 		docker build -f Dockerfile.arm64 \
 		-t gotify/server-arm64:latest \
 		-t gotify/server-arm64:${VERSION} \
-		-t gotify/server-arm64:$(shell echo $(VERSION) | cut -d '.' -f -2) .
+		-t gotify/server-arm64:$(shell echo $(VERSION) | cut -d '.' -f -2) \
+		-t ghcr.io/gotify/server-arm64:latest \
+		-t ghcr.io/gotify/server-arm64:${VERSION} \
+		-t ghcr.io/gotify/server-arm64:$(shell echo $(VERSION) | cut -d '.' -f -2) .
 	rm ${DOCKER_DIR}gotify-app
 
 build-docker: build-docker-amd64 build-docker-arm-7 build-docker-arm64