diff --git a/.github/workflows/api-push.yaml b/.github/workflows/api-push.yaml
index 7bafdc1..bcf0472 100644
--- a/.github/workflows/api-push.yaml
+++ b/.github/workflows/api-push.yaml
@@ -21,6 +21,12 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
           registry: docker.pkg.github.com
+      - name: Login to ghcr.io
+        uses: docker/login-action@v1
+        with:
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: ghcr.io
 
       - name: Build and push API
         uses: docker/build-push-action@v2
@@ -29,4 +35,5 @@ jobs:
           push: true
           pull: true
           tags: |
-            docker.pkg.github.com/engineer-man/piston/api
\ No newline at end of file
+            docker.pkg.github.com/engineer-man/piston/api
+            ghcr.io/engineer-man/piston
diff --git a/api/Dockerfile b/api/Dockerfile
index 395e414..40ecb71 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -26,3 +26,4 @@ RUN make -C ./src/nosocket/ all && make -C ./src/nosocket/ install
 
 CMD [ "node", "src", "-m", "-c", "/piston/config.yaml"]
 EXPOSE 2000/tcp
+