diff --git a/.github/workflows/dashboard-e2e.yml b/.github/workflows/dashboard-e2e.yml
index a3dff2697..ddf7700d5 100644
--- a/.github/workflows/dashboard-e2e.yml
+++ b/.github/workflows/dashboard-e2e.yml
@@ -1,54 +1,54 @@
-# name: Dashboard End-to-End
-# on:
-#   pull_request:
-#   push:
-#     branches:
-#       - main
-# env:
-#   CI: true
-# jobs:
-#   dashboard-e2e:
-#     name: Dashboard e2e
-#     runs-on: self-hosted
-#     container:
-#       image: ghcr.io/${{ github.repository }}/e2e
-#       credentials:
-#         username: ${{ github.repository_owner }}
-#         password: ${{ secrets.GITHUB_TOKEN }}
-#       options: --privileged --ipc=host
-#     defaults:
-#       run:
-#         shell: bash
-#         working-directory: packages/dashboard-e2e
-#     env:
-#       BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
-#       BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
-#       BROWSERSTACK_BUILD: ${{ github.head_ref }}:${{ github.event.number }}
-#       RMW_IMPLEMENTATION: rmw_cyclonedds_cpp
-#     steps:
-#       - uses: actions/checkout@v2
-#       - name: setup python
-#         run: apt update && apt install -y python3-venv python-is-python3
-#       - name: install rmw-cyclonedds-cpp
-#         run: apt install -y ros-humble-rmw-cyclonedds-cpp
-#       - name: bootstrap
-#         uses: ./.github/actions/bootstrap
-#         with:
-#           package: rmf-dashboard-e2e
-#           skip-build: true
-#       - name: test
-#         uses: nick-fields/retry@v2
-#         with:
-#           timeout_minutes: 20
-#           max_attempts: 3
-#           command: |
-#             . /rmf_demos_ws/install/setup.bash
-#             cd packages/dashboard-e2e
-#             pnpm test
-#           shell: bash
-#       - name: upload artifacts
-#         uses: actions/upload-artifact@v2
-#         if: always()
-#         with:
-#           name: artifacts
-#           path: packages/dashboard-e2e/artifacts
+name: Dashboard End-to-End
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+env:
+  CI: true
+jobs:
+  dashboard-e2e:
+    name: Dashboard e2e
+    runs-on: ubuntu-22.04
+    container:
+      image: ghcr.io/${{ github.repository }}/e2e
+      credentials:
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+      options: --privileged --ipc=host
+    defaults:
+      run:
+        shell: bash
+        working-directory: packages/dashboard-e2e
+    env:
+      BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
+      BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
+      BROWSERSTACK_BUILD: ${{ github.head_ref }}:${{ github.event.number }}
+      RMW_IMPLEMENTATION: rmw_cyclonedds_cpp
+    steps:
+      - uses: actions/checkout@v2
+      - name: setup python
+        run: apt update && apt install -y python3-venv python-is-python3
+      - name: install rmw-cyclonedds-cpp
+        run: apt install -y ros-humble-rmw-cyclonedds-cpp
+      - name: bootstrap
+        uses: ./.github/actions/bootstrap
+        with:
+          package: rmf-dashboard-e2e
+          skip-build: true
+      - name: test
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 20
+          max_attempts: 3
+          command: |
+            . /rmf_demos_ws/install/setup.bash
+            cd packages/dashboard-e2e
+            pnpm test
+          shell: bash
+      - name: upload artifacts
+        uses: actions/upload-artifact@v2
+        if: always()
+        with:
+          name: artifacts
+          path: packages/dashboard-e2e/artifacts
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index dfac3cfec..c9b2112a3 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -18,45 +18,45 @@ jobs:
           repository: ${{ github.repository }}/e2e
           tags: latest
           path: docker
-  # dashboard-e2e:
-  #   strategy:
-  #     matrix:
-  #       npm: ['latest']
-  #     fail-fast: false
-  #   needs: build-docker-images
-  #   name: Dashboard e2e
-  #   runs-on: self-hosted
-  #   container:
-  #     image: ghcr.io/${{ github.repository }}/e2e
-  #     options: --privileged --ipc=host
-  #   defaults:
-  #     run:
-  #       shell: bash
-  #       working-directory: packages/dashboard-e2e
-  #   env:
-  #     BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
-  #     BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
-  #     BROWSERSTACK_BUILD: ${{ github.head_ref }}:${{ github.event.number }}
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - name: bootstrap
-  #       uses: ./.github/actions/bootstrap
-  #       with:
-  #         package: rmf-dashboard-e2e
-  #         skip-build: true
-  #     - name: test
-  #       uses: nick-fields/retry@v2
-  #       with:
-  #         timeout_minutes: 20
-  #         max_attempts: 3
-  #         command: |
-  #           . /rmf_demos_ws/install/setup.bash
-  #           cd packages/dashboard-e2e
-  #           pnpm test
-  #         shell: bash
-  #     - name: upload artifacts
-  #       uses: actions/upload-artifact@v2
-  #       if: always()
-  #       with:
-  #         name: artifacts
-  #         path: packages/dashboard-e2e/artifacts
+  dashboard-e2e:
+    strategy:
+      matrix:
+        npm: ['latest']
+      fail-fast: false
+    needs: build-docker-images
+    name: Dashboard e2e
+    runs-on: ubuntu-22.04
+    container:
+      image: ghcr.io/${{ github.repository }}/e2e
+      options: --privileged --ipc=host
+    defaults:
+      run:
+        shell: bash
+        working-directory: packages/dashboard-e2e
+    env:
+      BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
+      BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
+      BROWSERSTACK_BUILD: ${{ github.head_ref }}:${{ github.event.number }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: bootstrap
+        uses: ./.github/actions/bootstrap
+        with:
+          package: rmf-dashboard-e2e
+          skip-build: true
+      - name: test
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 20
+          max_attempts: 3
+          command: |
+            . /rmf_demos_ws/install/setup.bash
+            cd packages/dashboard-e2e
+            pnpm test
+          shell: bash
+      - name: upload artifacts
+        uses: actions/upload-artifact@v2
+        if: always()
+        with:
+          name: artifacts
+          path: packages/dashboard-e2e/artifacts
diff --git a/README.md b/README.md
index 34d32fbf9..75318a2e4 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Nightly](https://github.com/open-rmf/rmf-web/actions/workflows/nightly.yml/badge.svg)](https://github.com/open-rmf/rmf-web/actions/workflows/nightly.yml) [![react-components](https://github.com/open-rmf/rmf-web/workflows/react-components/badge.svg)](https://github.com/open-rmf/rmf-web/actions?query=workflow%3Areact-components+branch%3Amain) [![dashboard](https://github.com/open-rmf/rmf-web/workflows/dashboard/badge.svg)](https://github.com/open-rmf/rmf-web/actions?query=workflow%3Adashboard+branch%3Amain) [![api-server](https://github.com/open-rmf/rmf-web/workflows/api-server/badge.svg)](https://github.com/open-rmf/rmf-web/actions?query=workflow%3Aapi-server+branch%3Amain) [![rmf-auth](https://github.com/open-rmf/rmf-web/actions/workflows/rmf-auth.yml/badge.svg)](https://github.com/open-rmf/rmf-web/actions/workflows/rmf-auth.yml) [![ros-translator](https://github.com/open-rmf/rmf-web/actions/workflows/ros-translator.yml/badge.svg)](https://github.com/open-rmf/rmf-web/actions/workflows/ros-translator.yml) [![api-client](https://github.com/open-rmf/rmf-web/actions/workflows/api-client.yml/badge.svg)](https://github.com/open-rmf/rmf-web/actions/workflows/api-client.yml) [![codecov](https://codecov.io/gh/open-rmf/rmf-web/branch/main/graph/badge.svg)](https://codecov.io/gh/open-rmf/rmf-web)
+[![Nightly](https://github.com/open-rmf/rmf-web/actions/workflows/nightly.yml/badge.svg)](https://github.com/open-rmf/rmf-web/actions/workflows/nightly.yml) [![Dashboard End-to-End](https://github.com/open-rmf/rmf-web/actions/workflows/dashboard-e2e.yml/badge.svg)](https://github.com/open-rmf/rmf-web/actions/workflows/dashboard-e2e.yml) [![react-components](https://github.com/open-rmf/rmf-web/workflows/react-components/badge.svg)](https://github.com/open-rmf/rmf-web/actions?query=workflow%3Areact-components+branch%3Amain) [![dashboard](https://github.com/open-rmf/rmf-web/workflows/dashboard/badge.svg)](https://github.com/open-rmf/rmf-web/actions?query=workflow%3Adashboard+branch%3Amain) [![api-server](https://github.com/open-rmf/rmf-web/workflows/api-server/badge.svg)](https://github.com/open-rmf/rmf-web/actions?query=workflow%3Aapi-server+branch%3Amain) [![rmf-auth](https://github.com/open-rmf/rmf-web/actions/workflows/rmf-auth.yml/badge.svg)](https://github.com/open-rmf/rmf-web/actions/workflows/rmf-auth.yml) [![ros-translator](https://github.com/open-rmf/rmf-web/actions/workflows/ros-translator.yml/badge.svg)](https://github.com/open-rmf/rmf-web/actions/workflows/ros-translator.yml) [![api-client](https://github.com/open-rmf/rmf-web/actions/workflows/api-client.yml/badge.svg)](https://github.com/open-rmf/rmf-web/actions/workflows/api-client.yml) [![codecov](https://codecov.io/gh/open-rmf/rmf-web/branch/main/graph/badge.svg)](https://codecov.io/gh/open-rmf/rmf-web)
 
 # RMF Web