diff --git a/.github/workflows/build-and-push-fleetctl-docker.yml b/.github/workflows/build-and-push-fleetctl-docker.yml
index 2fdc366bec..4f232e9a0c 100644
--- a/.github/workflows/build-and-push-fleetctl-docker.yml
+++ b/.github/workflows/build-and-push-fleetctl-docker.yml
@@ -54,3 +54,12 @@ jobs:
           docker tag fleetdm/fleetctl fleetdm/fleetctl:${{ inputs.image_tag }}
           docker push fleetdm/fleetctl:${{ inputs.image_tag }}
 
+      - name: Push To quay.io
+        id: push-to-quay
+        uses: redhat-actions/push-to-registry@v2
+        with:
+          image: fleetdm/fleetctl
+          tags: ${{ inputs.image_tag }}
+          registry: quay.io/
+          username: fleetdm+fleetreleaser
+          password: ${{ secrets.QUAY_REGISTRY_PASSWORD }}
diff --git a/.github/workflows/goreleaser-fleet.yaml b/.github/workflows/goreleaser-fleet.yaml
index a4b71925a5..4c933c4c86 100644
--- a/.github/workflows/goreleaser-fleet.yaml
+++ b/.github/workflows/goreleaser-fleet.yaml
@@ -56,3 +56,18 @@ jobs:
         env:
           GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get tag
+        run: |
+          echo "TAG=$(git describe --tags |  sed -e "s/^fleet-//")" >> $GITHUB_OUTPUT
+        id: docker
+
+      - name: Push To quay.io
+        id: push-to-quay
+        uses: redhat-actions/push-to-registry@v2
+        with:
+          image: fleetdm/fleet
+          tags: ${{ steps.docker.outputs.TAG }}
+          registry: quay.io/
+          username: fleetdm+fleetreleaser
+          password: ${{ secrets.QUAY_REGISTRY_PASSWORD }}
diff --git a/.github/workflows/goreleaser-snapshot-fleet.yaml b/.github/workflows/goreleaser-snapshot-fleet.yaml
index afe690055e..624633d4bf 100644
--- a/.github/workflows/goreleaser-snapshot-fleet.yaml
+++ b/.github/workflows/goreleaser-snapshot-fleet.yaml
@@ -22,7 +22,7 @@ jobs:
     #
     # Also not run if author is dependabot (it doesn't have access to Github secrets).
     if: ${{ (github.repository == 'fleetdm/fleet') && (github.actor != 'dependabot[bot]') }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     environment: Docker Hub
     steps:
       - name: Checkout
@@ -57,3 +57,18 @@ jobs:
       # Explicitly push the docker images as GoReleaser will not do so in snapshot mode
       - name: Publish Docker images
         run: docker push fleetdm/fleet --all-tags
+
+      - name: Get tag
+        run: |
+          echo "TAG=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_OUTPUT
+        id: docker
+
+      - name: Push To quay.io
+        id: push-to-quay
+        uses: redhat-actions/push-to-registry@v2
+        with:
+          image: fleetdm/fleet
+          tags: ${{ steps.docker.outputs.TAG }}
+          registry: quay.io/
+          username: fleetdm+fleetreleaser
+          password: ${{ secrets.QUAY_REGISTRY_PASSWORD }}