diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 83fa3401..de870674 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -170,14 +170,6 @@ jobs:
         with:
           path: ./client/artifacts
 
-      # Always cleanup even if other commands failed so we don't unnecessarily store
-      # the artifacts in the cloud 
-      - name: Cleanup client artifacts
-        uses: geekyeggo/delete-artifact@54ab544f12cdb7b71613a16a2b5a37a9ade990af
-        if: always()
-        with:
-          name: client-*
-
       - name: Publish to local repository
         run: ./gradlew publishToMavenLocal -Prelease_version=$RELEASE_VERSION
 
@@ -202,3 +194,11 @@ jobs:
         run: |
           gsutil -m rsync -r -a $OBJECT_ACL ./artifacts/client-dist gs://$GCS_BUCKET/client/$RELEASE_ARTIFACT_ID/$RELEASE_VERSION
         working-directory: ./client
+
+      # Make sure to cleanup manually if pipeline fails and you aren't rerunning !
+      - name: Cleanup client artifacts
+        uses: geekyeggo/delete-artifact@54ab544f12cdb7b71613a16a2b5a37a9ade990af
+        if: always()
+        with:
+          name: client-*
+