diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index b7659079f503..370745e90c73 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -35,6 +35,13 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
+      - name: Login to GHCR
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Get version
         id: version
         run: echo "::set-output name=version::$(jq -r .version package.json)"
diff --git a/ci/release-image/docker-bake.hcl b/ci/release-image/docker-bake.hcl
index cb55da69c1fd..27bf2194f8d3 100644
--- a/ci/release-image/docker-bake.hcl
+++ b/ci/release-image/docker-bake.hcl
@@ -15,6 +15,8 @@ target "code-server" {
     tags = [
         "docker.io/codercom/code-server:latest",
         notequal("latest",VERSION) ? "docker.io/codercom/code-server:${VERSION}" : "",
+        "ghcr.io/coder/code-server:latest",
+        notequal("latest",VERSION) ? "ghcr.io/coder/code-server:${VERSION}" : "",
     ]
     platforms = ["linux/amd64", "linux/arm64"]
 }