diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
index 8baa57609..b64ba0586 100644
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -6,12 +6,14 @@ on:
       package:
         required: true
         type: string
+      event_name:
+        required: true
+        type: string
 
 jobs:
   e2e-test:
     name: E2E Test
     runs-on: ubuntu-latest
-    concurrency: e2e-test
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
@@ -40,6 +42,7 @@ jobs:
           path: .turbo
           key: ${{ runner.os }}-turbo-build-${{ github.sha }}
       - name: E2E Test
+        if: ${{ inputs.event_name != 'pull_request' }}
         run: yarn test:e2e --cache-dir=".turbo" --filter=./packages/${{ inputs.package }}
         timeout-minutes: 5
         env:
@@ -49,6 +52,7 @@ jobs:
           PROXY_REST_URL: ${{ secrets.PROXY_REST_URL }}
       - name: Collect and upload the coverage report
         uses: codecov/codecov-action@v3
+        if: ${{ inputs.event_name != 'pull_request' }}
         with:
           files: ./packages/${{ inputs.package }}/coverage/lcov.info
           flags: ${{ inputs.package }}-e2e,${{ inputs.package }}
diff --git a/.github/workflows/lib-check-e2e.yml b/.github/workflows/lib-check-e2e.yml
new file mode 100644
index 000000000..80d21a781
--- /dev/null
+++ b/.github/workflows/lib-check-e2e.yml
@@ -0,0 +1,36 @@
+name: Library Checks (E2E)
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - 'website/**'
+  merge_group:
+
+jobs:
+  workqueue:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ahmadnassri/action-workflow-queue@v1
+        with:
+          timeout: 6000000
+  rest-e2e-test:
+    needs: workqueue
+    name: Rest
+    uses: ./.github/workflows/e2e-test.yml
+    secrets: inherit
+    with:
+      package: rest
+      event_name: ${{ github.event_name }}
+  bot-e2e-test:
+    name: Bot
+    needs: rest-e2e-test
+    if: ${{ always() }}
+    uses: ./.github/workflows/e2e-test.yml
+    secrets: inherit
+    with:
+      package: bot
+      event_name: ${{ github.event_name }}
diff --git a/.github/workflows/lib-check.yml b/.github/workflows/lib-check.yml
index 078fc80b4..c21975f6e 100644
--- a/.github/workflows/lib-check.yml
+++ b/.github/workflows/lib-check.yml
@@ -139,14 +139,15 @@ jobs:
     uses: ./.github/workflows/unit-test.yml
     with:
       package: bot
-  bot-e2e-test:
-    name: Bot
-    needs: bot-unit-test
-    if: ${{ github.ref == 'refs/heads/main' || github.event_name == 'merge_group' }}
-    uses: ./.github/workflows/e2e-test.yml
-    secrets: inherit
-    with:
-      package: bot
+  # https://github.com/orgs/community/discussions/12835
+  #  bot-e2e-test:
+  #    name: Bot
+  #    needs: bot-unit-test
+  #    if: ${{ github.ref == 'refs/heads/main' || github.event_name == 'merge_group' }}
+  #    uses: ./.github/workflows/e2e-test.yml
+  #    secrets: inherit
+  #    with:
+  #      package: bot
   bot-other-runtime-test:
     name: Bot
     needs: bot-unit-test
@@ -205,14 +206,15 @@ jobs:
     uses: ./.github/workflows/unit-test.yml
     with:
       package: rest
-  rest-e2e-test:
-    name: Rest
-    needs: rest-unit-test
-    if: ${{ github.ref == 'refs/heads/main' || github.event_name == 'merge_group' }}
-    uses: ./.github/workflows/e2e-test.yml
-    secrets: inherit
-    with:
-      package: rest
+  # https://github.com/orgs/community/discussions/12835
+  # rest-e2e-test:
+  #   name: Rest
+  #   needs: rest-unit-test
+  #   if: ${{ github.ref == 'refs/heads/main' || github.event_name == 'merge_group' }}
+  #   uses: ./.github/workflows/e2e-test.yml
+  #   secrets: inherit
+  #   with:
+  #     package: rest
   rest-other-runtime-test:
     name: Rest
     needs: rest-unit-test