diff --git a/.github/actions/cleanup/action.yaml b/.github/actions/cleanup/action.yaml
deleted file mode 100644
index 72caebf2..00000000
--- a/.github/actions/cleanup/action.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-name: 'OpenVidu Meet Cleanup'
-description: 'Clean up OpenVidu Meet test environment'
-runs:
-  using: 'composite'
-  steps:
-    - name: Show pre-cleanup status
-      continue-on-error: true
-      run: |
-        echo "=== System status before cleanup ==="
-        df -h
-        free -h
-        echo "=== Running processes ==="
-        ps aux | grep -i 'npm\|node\|livekit' | grep -v grep || true
-        echo "=== Docker containers ==="
-        docker ps -a || true
-      shell: bash
-
-    - name: Kill backend process
-      run: pkill -f "npm run start:prod" || true
-      shell: bash
-
-    - name: Stop OpenVidu Local Deployment containers
-      continue-on-error: true
-      run: |
-        if [ -d "openvidu-local-deployment/community" ]; then
-          cd openvidu-local-deployment/community
-          docker compose down -v || echo "Warning: Failed to stop containers cleanly"
-        else
-          echo "Directory openvidu-local-deployment/community not found, skipping"
-        fi
-      shell: bash
-
-    - name: Clean up temporary files
-      continue-on-error: true
-      run: |
-        echo "Cleaning temporary files..."
-        rm -rf /tmp/openvidu-* || echo "Warning: Failed to clean some OpenVidu temp files"
-        rm -rf /tmp/livekit-* || echo "Warning: Failed to clean some LiveKit temp files"
-      shell: bash
-
-    - name: Check for running containers
-      continue-on-error: true
-      run: |
-        CONTAINERS=$(docker ps -q)
-        if [ -n "$CONTAINERS" ]; then
-          echo "Warning: Found running containers. Stopping them before prune."
-          docker stop $CONTAINERS || true
-        fi
-      shell: bash
-
-    - name: Clean up Docker resources
-      continue-on-error: true
-      run: |
-        echo "Pruning Docker system..."
-        docker system prune -f --volumes || echo "Warning: Docker system prune failed"
-      shell: bash
-
-    - name: Kill orphaned processes
-      continue-on-error: true
-      run: |
-        echo "Checking for orphaned processes..."
-        ORPHANED=$(ps aux | grep -i 'npm\|node\|livekit' | grep -v grep | awk '{print $2}')
-        if [ -n "$ORPHANED" ]; then
-          echo "Killing processes: $ORPHANED"
-          kill -9 $ORPHANED || echo "Warning: Some processes couldn't be killed"
-        else
-          echo "No orphaned processes found"
-        fi
-      shell: bash
-
-    - name: Clean specific directories
-      continue-on-error: true
-      run: |
-        echo "Cleaning specific directories..."
-        # Don't try to remove the entire working directory
-        # Instead, clean specific subdirectories that might cause permission issues
-
-        if [ -d "openvidu-local-deployment" ]; then
-          sudo rm -rf openvidu-local-deployment || echo "Warning: Failed to remove openvidu-local-deployment"
-        fi
-
-        # Clean build and cache directories
-        find . -type d -name "node_modules" -exec rm -rf {} +
-        find . -type d -name "dist" -exec rm -rf {} +
-        find . -type d -name ".cache" -exec rm -rf {} +
-      shell: bash
-
-    - name: Show system status
-      continue-on-error: true
-      run: |
-        echo "=== System status after cleanup ==="
-        df -h
-        free -h
-        docker ps -a
-        echo "=== Cleanup completed ==="
-      shell: bash
diff --git a/.github/workflows/openvidu-components-angular-tests.yml b/.github/workflows/openvidu-components-angular-tests.yml
index 8b50105c..7d1f6f9b 100644
--- a/.github/workflows/openvidu-components-angular-tests.yml
+++ b/.github/workflows/openvidu-components-angular-tests.yml
@@ -80,7 +80,7 @@ jobs:
         run: npm run e2e:nested-events --prefix openvidu-components-angular
       - name: Cleanup
         if: always()
-        uses: ./.github/actions/cleanup
+        uses: OpenVidu/actions/cleanup@main
 
   nested_structural_directives:
     needs: test_setup
@@ -113,7 +113,7 @@ jobs:
         run: npm run e2e:nested-structural-directives --prefix openvidu-components-angular
       - name: Cleanup
         if: always()
-        uses: ./.github/actions/cleanup
+        uses: OpenVidu/actions/cleanup@main
 
   nested_attribute_directives:
     needs: test_setup
@@ -146,7 +146,7 @@ jobs:
         run: npm run e2e:nested-attribute-directives --prefix openvidu-components-angular
       - name: Cleanup
         if: always()
-        uses: ./.github/actions/cleanup
+        uses: OpenVidu/actions/cleanup@main
 
   e2e_directives:
     needs: test_setup
@@ -179,7 +179,7 @@ jobs:
         run: npm run e2e:lib-directives --prefix openvidu-components-angular
       - name: Cleanup
         if: always()
-        uses: ./.github/actions/cleanup
+        uses: OpenVidu/actions/cleanup@main
 
   e2e_chat:
     needs: test_setup
@@ -212,7 +212,7 @@ jobs:
         run: npm run e2e:lib-chat --prefix openvidu-components-angular
       - name: Cleanup
         if: always()
-        uses: ./.github/actions/cleanup
+        uses: OpenVidu/actions/cleanup@main
 
   e2e_events:
     needs: test_setup
@@ -245,7 +245,7 @@ jobs:
         run: npm run e2e:lib-events --prefix openvidu-components-angular
       - name: Cleanup
         if: always()
-        uses: ./.github/actions/cleanup
+        uses: OpenVidu/actions/cleanup@main
 
   e2e_media_devices:
     needs: test_setup
@@ -278,7 +278,7 @@ jobs:
         run: npm run e2e:lib-media-devices --prefix openvidu-components-angular
       - name: Cleanup
         if: always()
-        uses: ./.github/actions/cleanup
+        uses: OpenVidu/actions/cleanup@main
 
   e2e_panels:
     needs: test_setup
@@ -311,7 +311,7 @@ jobs:
         run: npm run e2e:lib-panels --prefix openvidu-components-angular
       - name: Cleanup
         if: always()
-        uses: ./.github/actions/cleanup
+        uses: OpenVidu/actions/cleanup@main
 
   e2e_screen_sharing:
     needs: test_setup
@@ -344,7 +344,7 @@ jobs:
         run: npm run e2e:lib-screensharing --prefix openvidu-components-angular
       - name: Cleanup
         if: always()
-        uses: ./.github/actions/cleanup
+        uses: OpenVidu/actions/cleanup@main
 
   e2e_stream:
     needs: test_setup
@@ -377,7 +377,7 @@ jobs:
         run: npm run e2e:lib-stream --prefix openvidu-components-angular
       - name: Cleanup
         if: always()
-        uses: ./.github/actions/cleanup
+        uses: OpenVidu/actions/cleanup@main
 
   e2e_toolbar:
     needs: test_setup
@@ -410,4 +410,4 @@ jobs:
         run: npm run e2e:lib-toolbar --prefix openvidu-components-angular
       - name: Cleanup
         if: always()
-        uses: ./.github/actions/cleanup
+        uses: OpenVidu/actions/cleanup@main
diff --git a/.github/workflows/openvidu-integration-tests.yml b/.github/workflows/openvidu-integration-tests.yml
index 90683f55..05ba949d 100644
--- a/.github/workflows/openvidu-integration-tests.yml
+++ b/.github/workflows/openvidu-integration-tests.yml
@@ -51,3 +51,7 @@ jobs:
           name: openvidu-integration-tests-report
           path: ./openvidu/openvidu-test-integration/test-results.json
           retention-days: 7
+      - name: Cleanup
+        if: always()
+        uses: OpenVidu/actions/cleanup@main
+