diff --git a/.github/workflows/push-ci.yml b/.github/workflows/push-ci.yml
index 26be4c453d..e46fc898ee 100644
--- a/.github/workflows/push-ci.yml
+++ b/.github/workflows/push-ci.yml
@@ -50,8 +50,12 @@ jobs:
         IMAGE_VERSION: ${{ needs.build-and-test-amd64.outputs.image-version }}
       run: |
           podman load -i cryostat-amd64.tar
+<<<<<<< HEAD
           podman tag quay.io/cryostat/cryostat:latest $CRYOSTAT_IMG:$IMAGE_VERSION-linux-amd64
       if: github.repository_owner == 'cryostatio'
+=======
+          podman tag $CRYOSTAT_IMG:$IMAGE_VERSION-linux-amd64
+>>>>>>> 62cc0e4d (ci(tags): do not tag images as 'latest' (#1940))
     - uses: actions/download-artifact@v3
       with:
         name: cryostat-arm64
@@ -61,14 +65,19 @@ jobs:
         IMAGE_VERSION: ${{ needs.build-and-test-arm64.outputs.image-version }}
       run: |
           podman load -i cryostat-arm64.tar
+<<<<<<< HEAD
           podman tag quay.io/cryostat/cryostat:latest $CRYOSTAT_IMG:$IMAGE_VERSION-linux-arm64
       if: github.repository_owner == 'cryostatio'
+=======
+          podman tag $CRYOSTAT_IMG:$IMAGE_VERSION-linux-arm64
+>>>>>>> 62cc0e4d (ci(tags): do not tag images as 'latest' (#1940))
     - name: Create OCI Manifest
       id: create-manifest
       env:
         IMAGE_VERSION: ${{ needs.build-and-test-amd64.outputs.image-version }}
       run: |
         podman manifest create $CRYOSTAT_IMG:$IMAGE_VERSION containers-storage:$CRYOSTAT_IMG:$IMAGE_VERSION-linux-amd64 containers-storage:$CRYOSTAT_IMG:$IMAGE_VERSION-linux-arm64
+<<<<<<< HEAD
         if [ "$GITHUB_REF" == "refs/heads/main" ]; then
           podman tag \
           ${{ env.CRYOSTAT_IMG }}:$IMAGE_VERSION \
@@ -78,6 +87,9 @@ jobs:
           echo "tags=$IMAGE_VERSION" >> "$GITHUB_OUTPUT"
         fi
       if: github.repository_owner == 'cryostatio'
+=======
+        echo "tags=$IMAGE_VERSION" >> "$GITHUB_OUTPUT"
+>>>>>>> 62cc0e4d (ci(tags): do not tag images as 'latest' (#1940))
     - name: Push to quay.io
       uses: redhat-actions/push-to-registry@v2
       with: