diff --git a/.github/workflows/desktop-e2e.yml b/.github/workflows/desktop-e2e.yml
index 0105ddcb0dc3..2bca4d6a361b 100644
--- a/.github/workflows/desktop-e2e.yml
+++ b/.github/workflows/desktop-e2e.yml
@@ -7,7 +7,7 @@ on:
   push:
 jobs:
   prepare-linux:
-    # TODO: only run if this is neither main nor a tag
+    if: ${{ !startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -23,7 +23,6 @@ jobs:
     outputs:
       container_image: ${{ env.inner_container_image }}
   build-linux:
-    # TODO: only run if this is neither main nor a tag
     needs: prepare-linux
     runs-on: ubuntu-latest
     container:
@@ -66,8 +65,8 @@ jobs:
       matrix:
         os: [debian11, debian12, ubuntu2004, ubuntu2204, ubuntu2304, fedora38, fedora37, fedora36]
     steps:
-      # TODO: only if ref is not tag
       - uses: actions/download-artifact@v3
+        if: ${{ needs.build-linux.result == 'success' }}
         with:
           name: linux-build
           path: ~/.cache/mullvad-test/packages