diff --git a/.github/workflows/promote.yaml b/.github/workflows/promote.yaml
new file mode 100644
index 00000000..68d88bfa
--- /dev/null
+++ b/.github/workflows/promote.yaml
@@ -0,0 +1,25 @@
+---
+name: Promote AWX Operator image
+on:
+  release:
+    types: [published]
+
+jobs:
+  promote:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Log in to GHCR
+        run: |
+          echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Log in to Quay
+        run: |
+          echo ${{ secrets.QUAY_TOKEN }} | docker login quay.io -u ${{ secrets.QUAY_USER }} --password-stdin
+
+      - name: Re-tag and promote awx-operator image
+        run: |
+          docker pull ghcr.io/${{ github.repository }}:${{ github.event.release.tag_name }}
+          docker tag ghcr.io/${{ github.repository }}:${{ github.event.release.tag_name }} quay.io/${{ github.repository }}:${{ github.event.release.tag_name }}
+          docker tag ghcr.io/${{ github.repository }}:${{ github.event.release.tag_name }} quay.io/${{ github.repository }}:latest
+          docker push quay.io/${{ github.repository }}:${{ github.event.release.tag_name }}
+          docker push quay.io/${{ github.repository }}:latest
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
deleted file mode 100644
index e7bb3ada..00000000
--- a/.github/workflows/release.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-
-name: Release
-
-on:
-  release:
-    types:
-      - created
-
-jobs:
-  release:
-    runs-on: ubuntu-18.04
-    name: Push tagged image to Quay
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Build Image
-        run: |
-          IMG=awx-operator:${{ github.event.release.tag_name }} make docker-build
-          docker tag awx-operator:${{ github.event.release.tag_name }} awx-operator:latest
-
-      - name: Push To Quay
-        uses: redhat-actions/push-to-registry@v2.1.1
-        with:
-          image: awx-operator
-          tags: "${{ github.event.release.tag_name }} latest"
-          registry: quay.io/ansible/
-          username: ${{ secrets.QUAY_USERNAME }}
-          password: ${{ secrets.QUAY_TOKEN }}