diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 263e4a829ce..c8c29e8adcb 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -13,7 +13,7 @@ jobs:
     name: Prepare release with Changesets
     runs-on: ubuntu-22.04
     outputs:
-      published: ${{ steps.changesets.outputs.published }}
+      hasChangesets: ${{ steps.changesets.outputs.hasChangesets }}
     permissions:
       contents: write
       pull-requests: write
@@ -39,7 +39,7 @@ jobs:
   release:
     name: Deploy and release to sandbox
     needs: prepare
-    if: needs.prepare.outputs.published == 'true'
+    if: needs.prepare.outputs.hasChangesets == 'false'
     runs-on: ubuntu-22.04
     env:
       API_URI: /graphql/
diff --git a/.github/workflows/publish-containers.yml b/.github/workflows/publish-containers.yml
index fa18b9e2926..ac6ab7a7d02 100644
--- a/.github/workflows/publish-containers.yml
+++ b/.github/workflows/publish-containers.yml
@@ -1,10 +1,8 @@
 name: Publish container image
 
 on:
-  push:
-    tags:
-      # Matches stable and pre-releases
-      - "[0-9]+.[0-9]+.[0-9]+*"
+  release:
+    types: [published]
 
 jobs:
   docker: