diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 713db52c..63371d35 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
           java-version: '17'
           distribution: 'zulu'
           cache: gradle
-      - uses: gradle/gradle-build-action@v2
+      - uses: gradle/gradle-build-action@v3
       - name: Run :buildShadowPlugin task
         run: ./gradlew :plugin:buildShadowPlugin
         env:
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 039baf87..76a5201e 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -3,11 +3,23 @@ name: Publish to Marketplace
 on:
   release:
     types: [ published ]
+    branches: [ releases/233 ]
 
 jobs:
   publish:
     name: Publish Package Search to Marketplace
     runs-on: ubuntu-latest
+    env:
+      MARKETPLACE_TOKEN: ${{ secrets.MARKETPLACE_TOKEN }}
+      GRADLE_ENTERPRISE_KEY: ${{ secrets.GRADLE_ENTERPRISE_KEY }}
+      SPACE_INTELLIJ_NIGHTLIES_TOKEN: ${{ secrets.SPACE_INTELLIJ_NIGHTLIES_TOKEN }}
+      SPACE_INTELLIJ_NIGHTLIES_USERNAME: ${{ secrets.SPACE_INTELLIJ_NIGHTLIES_USERNAME }}
+      SPACE_PACKAGE_SEARCH_TOKEN: ${{ secrets.SPACE_PACKAGE_SEARCH_TOKEN }}
+      SPACE_PACKAGE_SEARCH_USERNAME: ${{ secrets.SPACE_PACKAGE_SEARCH_USERNAME }}
+      RUN_NUMBER: ${{ github.run_number }}
+      RUN_ATTEMPT: ${{ github.run_attempt }}
+      CHANGE_NOTES: ${{ github.event.release.body }}
+      KMP: true
     steps:
       - uses: actions/checkout@v4
         with:
@@ -17,21 +29,10 @@ jobs:
         with:
           java-version: '17'
           distribution: 'zulu'
-      - uses: gradle/gradle-build-action@v2
-      - name: Run :publishShadowPluginToMarketplace task
-        run: ./gradlew publishAllPublicationsToSpaceRepository :plugin:publishPluginToMarketplace
-        env:
-          MARKETPLACE_TOKEN: ${{ secrets.MARKETPLACE_TOKEN }}
-          GRADLE_ENTERPRISE_KEY: ${{ secrets.GRADLE_ENTERPRISE_KEY }}
-          SPACE_INTELLIJ_NIGHTLIES_TOKEN: ${{ secrets.SPACE_INTELLIJ_NIGHTLIES_TOKEN }}
-          SPACE_INTELLIJ_NIGHTLIES_USERNAME: ${{ secrets.SPACE_INTELLIJ_NIGHTLIES_USERNAME }}
-          SPACE_PACKAGE_SEARCH_TOKEN: ${{ secrets.SPACE_PACKAGE_SEARCH_TOKEN }}
-          SPACE_PACKAGE_SEARCH_USERNAME: ${{ secrets.SPACE_PACKAGE_SEARCH_USERNAME }}
-          CHANGE_NOTES: ${{ github.event.release.body }}
-      - name: Run :publishStablePluginToTBE task
+      - uses: gradle/gradle-build-action@v3
+      - name: Publish libraries
+        run: ./gradlew publishAllPublicationsToSpaceRepository
+      - name: Publish release plugin to TBE
         run: ./gradlew :plugin:publishReleasePluginToTBE
-        env:
-          KMP: true
-          TOOLBOX_ENTERPRISE_TOKEN: ${{ secrets.TOOLBOX_ENTERPRISE_TOKEN }}
-          GRADLE_ENTERPRISE_KEY: ${{ secrets.GRADLE_ENTERPRISE_KEY }}
-          CHANGE_NOTES: ${{ github.event.release.body }}
+      - name: Publish plugin to Marketplace
+        run: ./gradlew :plugin:publishPluginToMarketplace
diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
index 22402283..7c318886 100644
--- a/.github/workflows/publish-snapshot.yml
+++ b/.github/workflows/publish-snapshot.yml
@@ -8,6 +8,17 @@ jobs:
   publish:
     name: Publish Package Search Snapshot to TBE
     runs-on: ubuntu-latest
+    continue-on-error: true
+    env:
+      TOOLBOX_ENTERPRISE_TOKEN: ${{ secrets.TOOLBOX_ENTERPRISE_TOKEN }}
+      GRADLE_ENTERPRISE_KEY: ${{ secrets.GRADLE_ENTERPRISE_KEY }}
+      SPACE_INTELLIJ_NIGHTLIES_TOKEN: ${{ secrets.SPACE_INTELLIJ_NIGHTLIES_TOKEN }}
+      SPACE_INTELLIJ_NIGHTLIES_USERNAME: ${{ secrets.SPACE_INTELLIJ_NIGHTLIES_USERNAME }}
+      SPACE_PACKAGE_SEARCH_TOKEN: ${{ secrets.SPACE_PACKAGE_SEARCH_TOKEN }}
+      SPACE_PACKAGE_SEARCH_USERNAME: ${{ secrets.SPACE_PACKAGE_SEARCH_USERNAME }}
+      RUN_NUMBER: ${{ github.run_number }}
+      RUN_ATTEMPT: ${{ github.run_attempt }}
+      KMP: true
     steps:
       - uses: actions/checkout@v4
         with:
@@ -19,15 +30,7 @@ jobs:
           distribution: 'zulu'
           cache: gradle
       - uses: gradle/gradle-build-action@v2
-      - name: Run :publishShadowPlugin task
-        run: ./gradlew :plugin:publishSnapshotPluginToTBE publishAllPublicationsToSpaceRepository
-        env:
-          TOOLBOX_ENTERPRISE_TOKEN: ${{ secrets.TOOLBOX_ENTERPRISE_TOKEN }}
-          GRADLE_ENTERPRISE_KEY: ${{ secrets.GRADLE_ENTERPRISE_KEY }}
-          SPACE_INTELLIJ_NIGHTLIES_TOKEN: ${{ secrets.SPACE_INTELLIJ_NIGHTLIES_TOKEN }}
-          SPACE_INTELLIJ_NIGHTLIES_USERNAME: ${{ secrets.SPACE_INTELLIJ_NIGHTLIES_USERNAME }}
-          SPACE_PACKAGE_SEARCH_TOKEN: ${{ secrets.SPACE_PACKAGE_SEARCH_TOKEN }}
-          SPACE_PACKAGE_SEARCH_USERNAME: ${{ secrets.SPACE_PACKAGE_SEARCH_USERNAME }}
-          RUN_NUMBER: ${{ github.run_number }}
-          RUN_ATTEMPT: ${{ github.run_attempt }}
-          KMP: true
+      - name: Publish libraries
+        run: ./gradlew publishAllPublicationsToSpaceRepository
+      - name: Publish plugin snapshot to TBE
+        run: ./gradlew :plugin:publishSnapshotPluginToTBE
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ef0fc79b..eee5624a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -3,6 +3,7 @@ name: Run tests
 on:
   pull_request:
     branches: [ releases/233 ]
+
 jobs:
   gradle:
     strategy: