diff --git a/.github/actions/build-docker-image-service/action.yml b/.github/actions/build-docker-image-service/action.yml
new file mode 100644
index 00000000000..2a7e791179e
--- /dev/null
+++ b/.github/actions/build-docker-image-service/action.yml
@@ -0,0 +1,69 @@
+name: 'Build Micro Services Docker image'
+description: 'Build Rocket.Chat Micro Services Docker images'
+
+inputs:
+  docker-tag:
+    required: true
+  service:
+    required: true
+  username:
+    required: false
+  password:
+    required: false
+
+outputs:
+  image-name:
+    value: ${{ steps.build-image.outputs.image-name }}
+
+runs:
+  using: "composite"
+  steps:
+    # - shell: bash
+    #   name: Free disk space
+    #   run: |
+    #     sudo swapoff -a
+    #     sudo rm -f /swapfile
+    #     sudo apt clean
+    #     docker rmi $(docker image ls -aq)
+    #     df -h
+
+    - shell: bash
+      id: build-image
+      run: |
+        LOWERCASE_REPOSITORY=$(echo "${{ github.repository_owner }}" | tr "[:upper:]" "[:lower:]")
+
+        IMAGE_TAG="${{ inputs.docker-tag }}"
+
+        IMAGE_NAME="ghcr.io/${LOWERCASE_REPOSITORY}/${{ inputs.service }}-service:${IMAGE_TAG}"
+
+        echo "Building Docker image for service: ${{ inputs.service }}:${IMAGE_TAG}"
+
+        if [[ "${{ inputs.service }}" == "ddp-streamer" ]]; then
+          DOCKERFILE_PATH="./ee/apps/ddp-streamer/Dockerfile"
+        else
+          DOCKERFILE_PATH="./apps/meteor/ee/server/services/Dockerfile"
+        fi
+
+        docker build \
+          --build-arg SERVICE=${{ inputs.service }} \
+          -t ${IMAGE_NAME} \
+          -f ${DOCKERFILE_PATH} \
+          .
+
+        echo "::set-output name=image-name::${IMAGE_NAME}"
+
+    - name: Login to GitHub Container Registry
+      if: github.event.pull_request.head.repo.full_name == github.repository || github.ref == 'refs/heads/develop'
+      uses: docker/login-action@v2
+      with:
+        registry: ghcr.io
+        username: ${{ inputs.username }}
+        password: ${{ inputs.password }}
+
+    - name: Publish image
+      shell: bash
+      if: github.event.pull_request.head.repo.full_name == github.repository || github.ref == 'refs/heads/develop'
+      run: |
+        echo "Push Docker image: ${{ steps.build-image.outputs.image-name }}"
+
+        docker push ${{ steps.build-image.outputs.image-name }}
diff --git a/.github/actions/build-docker-image/action.yml b/.github/actions/build-docker-image/action.yml
new file mode 100644
index 00000000000..06a996a7a74
--- /dev/null
+++ b/.github/actions/build-docker-image/action.yml
@@ -0,0 +1,85 @@
+name: 'Build Docker image'
+description: 'Build Rocket.Chat Docker image'
+
+inputs:
+  root-dir:
+    required: true
+  docker-tag:
+    required: true
+  release:
+    required: true
+  username:
+    required: false
+  password:
+    required: false
+
+outputs:
+  image-name:
+    value: ${{ steps.build-image.outputs.image-name }}
+
+runs:
+  using: composite
+  steps:
+    # - shell: bash
+    #   name: Free disk space
+    #   run: |
+    #     sudo swapoff -a
+    #     sudo rm -f /swapfile
+    #     sudo apt clean
+    #     docker rmi $(docker image ls -aq)
+    #     df -h
+
+    - shell: bash
+      id: build-image
+      run: |
+        cd ${{ inputs.root-dir }}
+
+        LOWERCASE_REPOSITORY=$(echo "${{ github.repository_owner }}" | tr "[:upper:]" "[:lower:]")
+        IMAGE_NAME="rocket.chat"
+        if [[ '${{ inputs.release }}' = 'preview' ]]; then
+          IMAGE_NAME="${IMAGE_NAME}.preview"
+        fi;
+
+        IMAGE_NAME="ghcr.io/${LOWERCASE_REPOSITORY}/${IMAGE_NAME}:${{ inputs.docker-tag }}"
+        if [[ '${{ inputs.release }}' = 'alpine' ]]; then
+          IMAGE_NAME="${IMAGE_NAME}.${{ inputs.release }}"
+        fi;
+
+        echo "Build Docker image ${IMAGE_NAME}"
+
+        DOCKER_PATH="${GITHUB_WORKSPACE}/apps/meteor/.docker"
+        if [[ '${{ inputs.release }}' = 'preview' ]]; then
+          DOCKER_PATH="${DOCKER_PATH}-mongo"
+        fi;
+
+        DOCKERFILE_PATH="${DOCKER_PATH}/Dockerfile"
+        if [[ '${{ inputs.release }}' = 'alpine' ]]; then
+          DOCKERFILE_PATH="${DOCKERFILE_PATH}.${{ inputs.release }}"
+        fi;
+
+        echo "Copy Dockerfile for release: ${{ inputs.release }}"
+        cp $DOCKERFILE_PATH ./Dockerfile
+        if [ -e ${DOCKER_PATH}/entrypoint.sh ]; then
+          cp ${DOCKER_PATH}/entrypoint.sh .
+        fi;
+
+        echo "Build ${{ inputs.release }} Docker image"
+        docker build -t $IMAGE_NAME .
+
+        echo "::set-output name=image-name::${IMAGE_NAME}"
+
+    - name: Login to GitHub Container Registry
+      if: github.event.pull_request.head.repo.full_name == github.repository && (github.event_name == 'release' || github.ref == 'refs/heads/develop')
+      uses: docker/login-action@v2
+      with:
+        registry: ghcr.io
+        username: ${{ inputs.username }}
+        password: ${{ inputs.password }}
+
+    - name: Publish image
+      shell: bash
+      if: github.event.pull_request.head.repo.full_name == github.repository && (github.event_name == 'release' || github.ref == 'refs/heads/develop')
+      run: |
+        echo "Push Docker image: ${{ steps.build-image.outputs.image-name }}"
+
+        docker push ${{ steps.build-image.outputs.image-name }}
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index ecfb34c5b1e..e21001d40a9 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -15,10 +15,49 @@ concurrency:
 
 env:
   CI: true
-  MONGO_URL: mongodb://localhost:27017
+  MONGO_URL: mongodb://localhost:27017/rocketchat
+  MONGO_OPLOG_URL: mongodb://mongo:27017/local
   TOOL_NODE_FLAGS: --max_old_space_size=4096
 
 jobs:
+  release-versions:
+    runs-on: ubuntu-latest
+    outputs:
+      release: ${{ steps.by-tag.outputs.release }}
+      latest-release: ${{ steps.latest.outputs.latest-release }}
+      docker-tag: ${{ steps.docker.outputs.docker-tag }}
+    steps:
+      - id: by-tag
+        run: |
+          if echo "$GITHUB_REF_NAME" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+$' ; then
+            RELEASE="latest"
+          elif echo "$GITHUB_REF_NAME" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$' ; then
+            RELEASE="release-candidate"
+          fi
+          echo "RELEASE: ${RELEASE}"
+          echo "::set-output name=release::${RELEASE}"
+
+      - id: latest
+        run: |
+          LATEST_RELEASE="$(
+            git -c 'versionsort.suffix=-' ls-remote -t --exit-code --refs --sort=-v:refname "https://github.com/$GITHUB_REPOSITORY" '*' |
+              sed -En '1!q;s/^[[:xdigit:]]+[[:space:]]+refs\/tags\/(.+)/\1/gp'
+          )"
+          echo "LATEST_RELEASE: ${LATEST_RELEASE}"
+          echo "::set-output name=latest-release::${LATEST_RELEASE}"
+
+      - id: docker
+        run: |
+          if [[ '${{ github.event_name }}' == 'pull_request' ]]; then
+            DOCKER_TAG="pr-${{ github.event.number }}"
+          elif echo "$GITHUB_REF_NAME" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+' ; then
+            DOCKER_TAG="$GITHUB_REF_NAME"
+          elif [[ $GITHUB_REF == 'refs/heads/develop' ]]; then
+            DOCKER_TAG="develop"
+          fi
+          echo "DOCKER_TAG: ${DOCKER_TAG}"
+          echo "::set-output name=docker-tag::${DOCKER_TAG}"
+
   build:
     runs-on: ubuntu-20.04
 
@@ -133,38 +172,61 @@ jobs:
         env:
           METEOR_PROFILE: 1000
         run: |
-          yarn build:ci -- --debug --directory /tmp/build-test
+          yarn build:ci -- --debug --directory /tmp/build
 
       - name: Build Rocket.Chat
         if: startsWith(github.ref, 'refs/pull/') != true
         run: |
-          yarn build:ci -- --directory /tmp/build-test
+          yarn build:ci -- --directory /tmp/build
 
       - name: Prepare build
         run: |
-          mkdir /tmp/build/
-          cd /tmp/build-test
+          cd /tmp/build
           tar czf /tmp/build/Rocket.Chat.tar.gz bundle
-          cd /tmp/build-test/bundle/programs/server
-          npm install --production
-          cd /tmp
-          tar czf Rocket.Chat.test.tar.gz ./build-test
 
-      - name: Store build for tests
+      - name: Store build
         uses: actions/upload-artifact@v2
         with:
-          name: build-test
-          path: /tmp/Rocket.Chat.test.tar.gz
+          name: build
+          path: /tmp/build/Rocket.Chat.tar.gz
 
-      - name: Store build
-        uses: actions/upload-artifact@v2
+  build-docker-preview:
+    runs-on: ubuntu-20.04
+    needs: [build, release-versions]
+    if: github.event_name == 'release' || github.ref == 'refs/heads/develop'
+    steps:
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - uses: actions/checkout@v3
+
+      - name: Restore build
+        uses: actions/download-artifact@v2
         with:
           name: build
           path: /tmp/build
 
+      - name: Unpack build
+        run: |
+          cd /tmp/build
+          tar xzf Rocket.Chat.tar.gz
+          rm Rocket.Chat.tar.gz
+
+      - name: Build Docker image
+        id: build-docker-image-preview
+        uses: ./.github/actions/build-docker-image
+        with:
+          root-dir: /tmp/build
+          docker-tag: ${{ needs.release-versions.outputs.docker-tag }}
+          release: preview
+          username: ${{ secrets.CR_USER }}
+          password: ${{ secrets.CR_PAT }}
+
   test:
     runs-on: ubuntu-20.04
-    needs: build
+    needs: [build, release-versions]
 
     strategy:
       matrix:
@@ -177,18 +239,6 @@ jobs:
         with:
           mongoDBVersion: ${{ matrix.mongodb-version }} --replSet=rs0
 
-      - name: Restore build for tests
-        uses: actions/download-artifact@v2
-        with:
-          name: build-test
-          path: /tmp
-
-      - name: Decompress build
-        run: |
-          cd /tmp
-          tar xzf Rocket.Chat.test.tar.gz
-          cd -
-
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
@@ -206,6 +256,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - uses: c-hive/gha-yarn-cache@v2
+
       - name: Cache turbo
         id: cache-turbo
         uses: actions/cache@v2
@@ -217,39 +268,120 @@ jobs:
             ${{ runner.os }}-turbo-
             ${{ runner.os }}-
 
-      - name: Yarn install
-        # if: steps.cache-nodemodules.outputs.cache-hit != 'true' || steps.cache-cypress.outputs.cache-hit != 'true'
+      - name: yarn install
         run: yarn
 
       - name: Unit Test
         run: yarn testunit
 
-      - name: Install Playwright
+      - name: Restore build
+        uses: actions/download-artifact@v2
+        with:
+          name: build
+          path: /tmp/build
+
+      - name: Unpack build
         run: |
-          cd ./apps/meteor
-          npx playwright install --with-deps
+          cd /tmp/build
+          tar xzf Rocket.Chat.tar.gz
+          rm Rocket.Chat.tar.gz
+
+      - name: Build Docker image
+        id: build-docker-image
+        if: matrix.mongodb-version != '5.0'
+        uses: ./.github/actions/build-docker-image
+        with:
+          root-dir: /tmp/build
+          docker-tag: ${{ needs.release-versions.outputs.docker-tag }}
+          release: official
+          username: ${{ secrets.CR_USER }}
+          password: ${{ secrets.CR_PAT }}
+
+      - name: Build Alpine Docker image
+        id: build-docker-image-alpine
+        if: matrix.mongodb-version == '5.0'
+        uses: ./.github/actions/build-docker-image
+        with:
+          root-dir: /tmp/build
+          docker-tag: ${{ needs.release-versions.outputs.docker-tag }}
+          release: alpine
+          username: ${{ secrets.CR_USER }}
+          password: ${{ secrets.CR_PAT }}
+
+      # TODO move startup/restart to its own github action
+      - name: Start up Rocket.Chat
+        run: |
+          LOWERCASE_REPOSITORY=$(echo "${{ github.repository_owner }}" | tr "[:upper:]" "[:lower:]")
+
+          IMAGE_TAG="${{ needs.release-versions.outputs.docker-tag }}"
+
+          # test alpine image on mongo 5.0 (no special reason to be mongo 5.0 but we need to test alpine at least once)
+          if [[ '${{ matrix.mongodb-version }}' = '5.0' ]]; then
+            IMAGE_TAG="${IMAGE_TAG}.alpine"
+          fi;
+
+          IMAGE_NAME="ghcr.io/${LOWERCASE_REPOSITORY}/rocket.chat:${IMAGE_TAG}"
+
+          docker run --name rocketchat -d \
+            --link mongo \
+            -p 3000:3000 \
+            -e TEST_MODE=true \
+            -e MONGO_URL=mongodb://mongo:27017/rocketchat \
+            -e MONGO_OPLOG_URL=mongodb://mongo:27017/local \
+            ${IMAGE_NAME}
 
       - name: E2E Test API
-        env:
-          TEST_MODE: 'true'
-          MONGO_URL: mongodb://localhost:27017/rocketchat
-          MONGO_OPLOG_URL: mongodb://localhost:27017/local
         run: |
+          docker logs rocketchat --tail=50
+
           cd ./apps/meteor
-          echo -e 'pcm.!default {\n type hw\n card 0\n}\n\nctl.!default {\n type hw\n card 0\n}' > ~/.asoundrc
-          Xvfb -screen 0 1024x768x24 :99 &
-          for i in $(seq 1 5); do (docker exec mongo mongo rocketchat --eval 'db.dropDatabase()') && npm run testci -- --test=testapi && s=0 && break || s=$? && sleep 1; done; (exit $s)
+          for i in $(seq 1 5); do
+            docker stop rocketchat
+            docker exec mongo mongo rocketchat --eval 'db.dropDatabase()'
 
-      - name: E2E Test UI
-        env:
-          TEST_MODE: 'true'
-          MONGO_URL: mongodb://localhost:27017/rocketchat
-          MONGO_OPLOG_URL: mongodb://localhost:27017/local
+            NOW=$(date "+%Y-%m-%dT%H:%M:%SZ")
+            echo $NOW
+
+            docker start rocketchat
+
+            until echo "$(docker logs rocketchat --since $NOW)" | grep -q "SERVER RUNNING"; do
+              echo "Waiting Rocket.Chat to start up"
+              ((c++)) && ((c==10)) && exit 1
+              sleep 10
+            done
+
+            npm run testapi && s=0 && break || s=$? && docker logs rocketchat --tail=100;
+          done;
+          exit $s
+
+      - name: Install Playwright
         run: |
           cd ./apps/meteor
+          npx playwright install --with-deps
+
+      - name: E2E Test UI
+        run: |
           echo -e 'pcm.!default {\n type hw\n card 0\n}\n\nctl.!default {\n type hw\n card 0\n}' > ~/.asoundrc
           Xvfb -screen 0 1024x768x24 :99 &
-          docker exec mongo mongo rocketchat --eval 'db.dropDatabase()' && npm run testci -- --test=test:playwright
+
+          docker logs rocketchat --tail=50
+
+          docker stop rocketchat
+          docker exec mongo mongo rocketchat --eval 'db.dropDatabase()'
+
+          NOW=$(date "+%Y-%m-%dT%H:%M:%SZ")
+          echo $NOW
+
+          docker start rocketchat
+
+          until echo "$(docker logs rocketchat --since $NOW)" | grep -q "SERVER RUNNING"; do
+            echo "Waiting Rocket.Chat to start up"
+            ((c++)) && ((c==10)) && exit 1
+            sleep 10
+          done
+
+          cd ./apps/meteor
+          npm run test:playwright
 
       - name: Store playwright test trace
         uses: actions/upload-artifact@v2
@@ -260,7 +392,7 @@ jobs:
 
   test-ee:
     runs-on: ubuntu-20.04
-    needs: build
+    needs: [build, release-versions]
 
     strategy:
       matrix:
@@ -276,18 +408,6 @@ jobs:
       - name: Launch NATS
         run: sudo docker run --name nats -d -p 4222:4222 nats:2.4
 
-      - name: Restore build for tests
-        uses: actions/download-artifact@v2
-        with:
-          name: build-test
-          path: /tmp
-
-      - name: Decompress build
-        run: |
-          cd /tmp
-          tar xzf Rocket.Chat.test.tar.gz
-          cd -
-
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
@@ -305,6 +425,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - uses: c-hive/gha-yarn-cache@v2
+
       - name: Cache turbo
         id: cache-turbo
         uses: actions/cache@v2
@@ -316,271 +437,262 @@ jobs:
             ${{ runner.os }}-turbo-
             ${{ runner.os }}-
 
-      - name: Yarn install
+      - name: yarn install
         run: yarn
 
-      - name: Build micro services
-        run: yarn build
+      - run: yarn build
 
-      - name: E2E Test API
-        env:
-          TEST_MODE: 'true'
-          MONGO_URL: mongodb://localhost:27017/rocketchat
-          MONGO_OPLOG_URL: mongodb://localhost:27017/local
-          ENTERPRISE_LICENSE: ${{ secrets.ENTERPRISE_LICENSE }}
-          TRANSPORTER: nats://localhost:4222
-          SKIP_PROCESS_EVENT_REGISTRATION: 'true'
-        run: |
-          echo -e 'pcm.!default {\n type hw\n card 0\n}\n\nctl.!default {\n type hw\n card 0\n}' > ~/.asoundrc
-          Xvfb -screen 0 1024x768x24 :99 &
-
-          cd ./apps/meteor/
-
-          for i in $(seq 1 5); do (docker exec mongo mongo rocketchat --eval 'db.dropDatabase()') && npm run testci -- --enterprise --test=testapi && s=0 && break || s=$? && sleep 1; done; (exit $s)
-
-      - name: Install Playwright
-        run: |
-          cd ./apps/meteor/
-          npx playwright install --with-deps
-
-      - name: E2E Test UI
-        env:
-          TEST_MODE: 'true'
-          MONGO_URL: mongodb://localhost:27017/rocketchat
-          MONGO_OPLOG_URL: mongodb://localhost:27017/local
-          ENTERPRISE_LICENSE: ${{ secrets.ENTERPRISE_LICENSE }}
-          TRANSPORTER: nats://localhost:4222
-          TEST_API_URL: http://localhost:4000
-          OVERWRITE_SETTING_Site_Url: http://localhost:4000
-          SKIP_PROCESS_EVENT_REGISTRATION: 'true'
-        run: |
-          echo -e 'pcm.!default {\n type hw\n card 0\n}\n\nctl.!default {\n type hw\n card 0\n}' > ~/.asoundrc
-          Xvfb -screen 0 1024x768x24 :99 &
-
-          cd ./apps/meteor
-
-          docker exec mongo mongo rocketchat --eval 'db.dropDatabase()' && npm run testci -- --enterprise --test=test:playwright:ee
+      - name: Unit Test
+        run: yarn testunit
 
-      - name: Store playwright test trace
-        uses: actions/upload-artifact@v2
-        if: failure()
+      - name: "Build Docker image: account"
+        uses: ./.github/actions/build-docker-image-service
         with:
-          name: ee-playwright-test-trace
-          path: ./apps/meteor/tests/e2e/test-failures*
-
-  #   notification:
-  #     runs-on: ubuntu-20.04
-  #     needs: test
-
-  #     steps:
-  #     - name: Rocket.Chat Notification
-  #       uses: RocketChat/Rocket.Chat.GitHub.Action.Notification@1.1.1
-  #       with:
-  #         type: ${{ job.status }}
-  #         job_name: '**Build and Test**'
-  #         url: ${{ secrets.ROCKETCHAT_WEBHOOK }}
-  #         commit: true
-  #         token: ${{ secrets.GITHUB_TOKEN }}
-
-  build-image-pr:
-    runs-on: ubuntu-20.04
-    if: github.event.pull_request.head.repo.full_name == github.repository
-
-    strategy:
-      matrix:
-        release: ['official', 'preview']
-
-    steps:
-      - uses: actions/checkout@v3
+          docker-tag: ${{ needs.release-versions.outputs.docker-tag }}
+          service: account
+          username: ${{ secrets.CR_USER }}
+          password: ${{ secrets.CR_PAT }}
 
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
+      - name: "Build Docker image: authorization"
+        uses: ./.github/actions/build-docker-image-service
         with:
-          registry: ghcr.io
+          docker-tag: ${{ needs.release-versions.outputs.docker-tag }}
+          service: authorization
           username: ${{ secrets.CR_USER }}
           password: ${{ secrets.CR_PAT }}
 
-      - name: Free disk space
-        run: |
-          sudo swapoff -a
-          sudo rm -f /swapfile
-          sudo apt clean
-          docker rmi $(docker image ls -aq)
-          df -h
-      - uses: c-hive/gha-yarn-cache@v2
-      - name: Cache turbo
-        id: cache-turbo
-        uses: actions/cache@v2
+      - name: "Build Docker image: ddp-streamer"
+        uses: ./.github/actions/build-docker-image-service
         with:
-          path: |
-            ./node_modules/.turbo
-          key: ${{ runner.OS }}-turbo-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-turbo-
-            ${{ runner.os }}-
+          docker-tag: ${{ needs.release-versions.outputs.docker-tag }}
+          service: ddp-streamer
+          username: ${{ secrets.CR_USER }}
+          password: ${{ secrets.CR_PAT }}
 
-      - name: Cache meteor local
-        uses: actions/cache@v2
-        with:
-          path: ./apps/meteor/.meteor/local
-          key: ${{ runner.OS }}-meteor_cache-${{ hashFiles('.meteor/versions') }}
-          restore-keys: |
-            ${{ runner.os }}-meteor_cache-
-            ${{ runner.os }}-
-      - name: Cache meteor
-        uses: actions/cache@v2
+      - name: "Build Docker image: presence"
+        uses: ./.github/actions/build-docker-image-service
         with:
-          path: ~/.meteor
-          key: ${{ runner.OS }}-meteor-${{ hashFiles('.meteor/release') }}
-          restore-keys: |
-            ${{ runner.os }}-meteor-
-            ${{ runner.os }}-
-      - name: Use Node.js 14.18.3
-        uses: actions/setup-node@v3
+          docker-tag: ${{ needs.release-versions.outputs.docker-tag }}
+          service: presence
+          username: ${{ secrets.CR_USER }}
+          password: ${{ secrets.CR_PAT }}
+
+      - name: "Build Docker image: stream-hub"
+        uses: ./.github/actions/build-docker-image-service
         with:
-          node-version: '14.18.3'
+          docker-tag: ${{ needs.release-versions.outputs.docker-tag }}
+          service: stream-hub
+          username: ${{ secrets.CR_USER }}
+          password: ${{ secrets.CR_PAT }}
 
-      - name: Install Meteor
+      - name: Launch Traefik
         run: |
-          # Restore bin from cache
-          set +e
-          METEOR_SYMLINK_TARGET=$(readlink ~/.meteor/meteor)
-          METEOR_TOOL_DIRECTORY=$(dirname "$METEOR_SYMLINK_TARGET")
-          set -e
-          LAUNCHER=$HOME/.meteor/$METEOR_TOOL_DIRECTORY/scripts/admin/launch-meteor
-          if [ -e $LAUNCHER ]
-          then
-            echo "Cached Meteor bin found, restoring it"
-            sudo cp "$LAUNCHER" "/usr/local/bin/meteor"
-          else
-            echo "No cached Meteor bin found."
-          fi
-
-          # only install meteor if bin isn't found
-          command -v meteor >/dev/null 2>&1 || curl https://install.meteor.com | sed s/--progress-bar/-sL/g | /bin/sh
+          docker run --name traefik -d \
+          -p 3000:80 \
+          -v /var/run/docker.sock:/var/run/docker.sock \
+          traefik:2.7 \
+          --providers.docker=true
 
-      - name: Versions
+      # TODO move startup/restart to its own github action
+      - name: Start up Rocket.Chat
         run: |
-          npm --versions
-          yarn -v
-          node -v
-          meteor --version
-          meteor npm --versions
-          meteor node -v
-          git version
+          LOWERCASE_REPOSITORY=$(echo "${{ github.repository_owner }}" | tr "[:upper:]" "[:lower:]")
 
-      - name: Yarn install
-        # if: steps.cache-nodemodules.outputs.cache-hit != 'true'
-        run: yarn
+          docker run --name rocketchat -d \
+            --link mongo \
+            --link nats \
+            -e TEST_MODE=true \
+            -e MONGO_URL=mongodb://mongo:27017/rocketchat \
+            -e MONGO_OPLOG_URL=mongodb://mongo:27017/local \
+            -e TRANSPORTER=nats://nats:4222 \
+            -e MOLECULER_LOG_LEVEL=info \
+            -e ENTERPRISE_LICENSE="${{ secrets.ENTERPRISE_LICENSE }}" \
+            -e SKIP_PROCESS_EVENT_REGISTRATION=true \
+            --label 'traefik.http.routers.rocketchat.rule=PathPrefix(`/`)' \
+            ghcr.io/${LOWERCASE_REPOSITORY}/rocket.chat:${{ needs.release-versions.outputs.docker-tag }}
+
+          # spin up all micro services
+          docker run --name ddp-streamer -d \
+            --link mongo \
+            --link nats \
+            -e PORT=4000 \
+            -e MONGO_URL=mongodb://mongo:27017/rocketchat \
+            -e MONGO_OPLOG_URL=mongodb://mongo:27017/local \
+            -e TRANSPORTER=nats://nats:4222 \
+            -e MOLECULER_LOG_LEVEL=info \
+            --label 'traefik.http.services.ddp-streamer.loadbalancer.server.port=4000' \
+            --label 'traefik.http.routers.ddp-streamer.rule=PathPrefix(`/websocket`) || PathPrefix(`/sockjs`)' \
+            ghcr.io/${LOWERCASE_REPOSITORY}/ddp-streamer-service:${{ needs.release-versions.outputs.docker-tag }}
+
+      - name: "Start service: stream-hub"
+        run: |
+          LOWERCASE_REPOSITORY=$(echo "${{ github.repository_owner }}" | tr "[:upper:]" "[:lower:]")
 
-      # To reduce memory need during actual build, build the packages solely first
-      # - name: Build a Meteor cache
-      #   run: |
-      #     # to do this we can clear the main files and it build the rest
-      #     echo "" > server/main.ts
-      #     echo "" > client/main.ts
-      #     sed -i.backup 's/rocketchat:livechat/#rocketchat:livechat/' .meteor/packages
-      #     meteor build --server-only --debug --directory /tmp/build-temp
-      #     git checkout -- server/main.ts client/main.ts .meteor/packages
+          docker run --name stream-hub -d \
+            --link mongo \
+            --link nats \
+            -e MONGO_URL=mongodb://mongo:27017/rocketchat \
+            -e MONGO_OPLOG_URL=mongodb://mongo:27017/local \
+            -e TRANSPORTER=nats://nats:4222 \
+            -e MOLECULER_LOG_LEVEL=info \
+            ghcr.io/${LOWERCASE_REPOSITORY}/stream-hub-service:${{ needs.release-versions.outputs.docker-tag }}
 
-      - name: Build Rocket.Chat
-        run: yarn build:ci -- --directory /tmp/build-pr
+          until echo "$(docker logs stream-hub)" | grep -q "NetworkBroker started successfully"; do
+            echo "Waiting 'stream-hub' to start up"
+            ((c++)) && ((c==10)) && exit 1
+            sleep 10
+          done
 
-      - name: Build Docker image for PRs
+      - name: "Start service: account"
         run: |
-          cd /tmp/build-pr
+          LOWERCASE_REPOSITORY=$(echo "${{ github.repository_owner }}" | tr "[:upper:]" "[:lower:]")
+
+          docker run --name account -d \
+            --link mongo \
+            --link nats \
+            -e MONGO_URL=mongodb://mongo:27017/rocketchat \
+            -e MONGO_OPLOG_URL=mongodb://mongo:27017/local \
+            -e TRANSPORTER=nats://nats:4222 \
+            -e MOLECULER_LOG_LEVEL=info \
+            ghcr.io/${LOWERCASE_REPOSITORY}/account-service:${{ needs.release-versions.outputs.docker-tag }}
 
+          until echo "$(docker logs account)" | grep -q "NetworkBroker started successfully"; do
+            echo "Waiting 'account' to start up"
+            ((c++)) && ((c==10)) && exit 1
+            sleep 10
+          done
+
+      - name: "Start service: authorization"
+        run: |
           LOWERCASE_REPOSITORY=$(echo "${{ github.repository_owner }}" | tr "[:upper:]" "[:lower:]")
-          IMAGE_NAME="rocket.chat"
-          if [[ '${{ matrix.release }}' = 'preview' ]]; then
-            IMAGE_NAME="${IMAGE_NAME}.preview"
-          fi;
 
-          IMAGE_NAME="ghcr.io/${LOWERCASE_REPOSITORY}/${IMAGE_NAME}:pr-${{ github.event.number }}"
+          docker run --name authorization -d \
+            --link mongo \
+            --link nats \
+            -e MONGO_URL=mongodb://mongo:27017/rocketchat \
+            -e MONGO_OPLOG_URL=mongodb://mongo:27017/local \
+            -e TRANSPORTER=nats://nats:4222 \
+            -e MOLECULER_LOG_LEVEL=info \
+            ghcr.io/${LOWERCASE_REPOSITORY}/authorization-service:${{ needs.release-versions.outputs.docker-tag }}
 
-          echo "Build official Docker image ${IMAGE_NAME}"
+          until echo "$(docker logs authorization)" | grep -q "NetworkBroker started successfully"; do
+            echo "Waiting 'authorization' to start up"
+            ((c++)) && ((c==10)) && exit 1
+            sleep 10
+          done
 
-          DOCKER_PATH="${GITHUB_WORKSPACE}/apps/meteor/.docker"
-          if [[ '${{ matrix.release }}' = 'preview' ]]; then
-            DOCKER_PATH="${DOCKER_PATH}-mongo"
-          fi;
+      - name: "Start service: presence"
+        run: |
+          LOWERCASE_REPOSITORY=$(echo "${{ github.repository_owner }}" | tr "[:upper:]" "[:lower:]")
 
-          echo "Build ${{ matrix.release }} Docker image"
-          cp ${DOCKER_PATH}/Dockerfile .
-          if [ -e ${DOCKER_PATH}/entrypoint.sh ]; then
-            cp ${DOCKER_PATH}/entrypoint.sh .
-          fi;
+          docker run --name presence -d \
+            --link mongo \
+            --link nats \
+            -e MONGO_URL=mongodb://mongo:27017/rocketchat \
+            -e MONGO_OPLOG_URL=mongodb://mongo:27017/local \
+            -e TRANSPORTER=nats://nats:4222 \
+            -e MOLECULER_LOG_LEVEL=info \
+            ghcr.io/${LOWERCASE_REPOSITORY}/presence-service:${{ needs.release-versions.outputs.docker-tag }}
+
+          until echo "$(docker logs presence)" | grep -q "NetworkBroker started successfully"; do
+            echo "Waiting 'presence' to start up"
+            ((c++)) && ((c==10)) && exit 1
+            sleep 10
+          done
 
-          docker build -t $IMAGE_NAME .
-          docker push $IMAGE_NAME
+      - name: E2E Test API
+        run: |
+          cd ./apps/meteor
+          for i in $(seq 1 5); do
+            docker stop rocketchat
+            docker stop stream-hub
+            docker stop account
+            docker stop authorization
+            docker stop ddp-streamer
+            docker stop presence
+
+            docker exec mongo mongo rocketchat --eval 'db.dropDatabase()'
+
+            NOW=$(date "+%Y-%m-%dT%H:%M:%SZ")
+            echo $NOW
+
+            docker start rocketchat
+            docker start stream-hub
+            docker start account
+            docker start authorization
+            docker start ddp-streamer
+            docker start presence
+
+            until echo "$(docker logs rocketchat --since $NOW)" | grep -q "SERVER RUNNING"; do
+              echo "Waiting Rocket.Chat to start up"
+              ((c++)) && ((c==10)) && exit 1
+              sleep 10
+            done
+
+            docker logs rocketchat --tail=50
+            docker logs stream-hub --tail=50
+            docker logs account --tail=50
+            docker logs authorization --tail=50
+            docker logs ddp-streamer --tail=50
+            docker logs presence --tail=50
+
+            npm run testapi && s=0 && break || s=$? && docker logs rocketchat --tail=100 && docker logs authorization --tail=50;
+          done;
+          exit $s
 
-  services-image-build-check:
-    runs-on: ubuntu-20.04
-    if: github.event.pull_request.head.repo.full_name == github.repository
+      - name: Install Playwright
+        run: |
+          cd ./apps/meteor
+          npx playwright install --with-deps
 
-    strategy:
-      matrix:
-        service: ['ddp-streamer']
+      - name: E2E Test UI
+        run: |
+          echo -e 'pcm.!default {\n type hw\n card 0\n}\n\nctl.!default {\n type hw\n card 0\n}' > ~/.asoundrc
+          Xvfb -screen 0 1024x768x24 :99 &
 
-    steps:
-      - uses: actions/checkout@v3
+          docker logs rocketchat --tail=50
 
-      - name: Use Node.js 14.18.3
-        uses: actions/setup-node@v3
-        with:
-          node-version: '14.18.3'
+          docker stop rocketchat
+          docker stop stream-hub
+          docker stop account
+          docker stop authorization
+          docker stop ddp-streamer
+          docker stop presence
 
-      - uses: c-hive/gha-yarn-cache@v2
-      - name: Cache turbo
-        id: cache-turbo
-        uses: actions/cache@v2
-        with:
-          path: |
-            ./node_modules/.turbo
-          key: ${{ runner.OS }}-turbo-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-turbo-
-            ${{ runner.os }}-
+          docker exec mongo mongo rocketchat --eval 'db.dropDatabase()'
 
-      - name: Build Docker images
-        env:
-          IMAGE_TAG: check
-        run: |
-          yarn
-          yarn build
+          NOW=$(date "+%Y-%m-%dT%H:%M:%SZ")
+          echo $NOW
 
-          echo "Building Docker image for service: ${{ matrix.service }}:${IMAGE_TAG}"
+          docker start rocketchat
+          docker start stream-hub
+          docker start account
+          docker start authorization
+          docker start ddp-streamer
+          docker start presence
 
-          docker build \
-            --build-arg SERVICE=${{ matrix.service }} \
-            -t rocketchat/${{ matrix.service }}-service:${IMAGE_TAG} \
-            -f ./ee/apps/ddp-streamer/Dockerfile \
-            .
+          until echo "$(docker logs rocketchat --since $NOW)" | grep -q "SERVER RUNNING"; do
+            echo "Waiting Rocket.Chat to start up"
+            ((c++)) && ((c==10)) && exit 1
+            sleep 10
+          done
 
-  release-versions:
-    runs-on: ubuntu-latest
-    outputs:
-      release: ${{ steps.by-tag.outputs.release }}
-      latest-release: ${{ steps.latest.outputs.latest-release }}
-    steps:
-      - id: by-tag
-        run: |
-          if echo "$GITHUB_REF_NAME" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+$' ; then
-            RELEASE="latest"
-          elif echo "$GITHUB_REF_NAME" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$' ; then
-            RELEASE="release-candidate"
-          fi
-          echo "RELEASE: ${RELEASE}"
-          echo "::set-output name=release::${RELEASE}"
+          docker logs rocketchat --tail=50
+          docker logs stream-hub --tail=50
+          docker logs account --tail=50
+          docker logs authorization --tail=50
+          docker logs ddp-streamer --tail=50
+          docker logs presence --tail=50
 
-      - id: latest
-        run: |
-          LATEST_RELEASE="$(
-            git -c 'versionsort.suffix=-' ls-remote -t --exit-code --refs --sort=-v:refname "https://github.com/$GITHUB_REPOSITORY" '*' |
-              sed -En '1!q;s/^[[:xdigit:]]+[[:space:]]+refs\/tags\/(.+)/\1/gp'
-          )"
-          echo "LATEST_RELEASE: ${LATEST_RELEASE}"
-          echo "::set-output name=latest-release::${LATEST_RELEASE}"
+          cd ./apps/meteor
+          npm run test:playwright
+
+      - name: Store playwright test trace
+        uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: playwright-test-trace
+          path: ./apps/meteor/tests/e2e/test-failures*
 
   deploy:
     runs-on: ubuntu-20.04
@@ -661,114 +773,95 @@ jobs:
               -d '{"tag":"'$GIT_TAG'"}'
           fi
 
-  image-build:
+  docker-image-publish:
     runs-on: ubuntu-20.04
-    needs: [deploy, release-versions]
+    needs: [deploy, build-docker-preview, release-versions]
 
     strategy:
       matrix:
-        # this is current a mix of variants and different images
+        # this is currently a mix of variants and different images
         release: ['official', 'preview', 'alpine']
 
     env:
       IMAGE_NAME: 'rocketchat/rocket.chat'
 
     steps:
-      - uses: actions/checkout@v3
-
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASS }}
 
-      - name: Restore build
-        uses: actions/download-artifact@v2
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
         with:
-          name: build
-          path: /tmp/build
+          registry: ghcr.io
+          username: ${{ secrets.CR_USER }}
+          password: ${{ secrets.CR_PAT }}
 
-      - name: Unpack build and prepare Docker files
+      - name: Get Docker image name
+        id: gh-docker
         run: |
-          cd /tmp/build
-          tar xzf Rocket.Chat.tar.gz
-          rm Rocket.Chat.tar.gz
-
-          DOCKER_PATH="${GITHUB_WORKSPACE}/apps/meteor/.docker"
+          LOWERCASE_REPOSITORY=$(echo "${{ github.repository_owner }}" | tr "[:upper:]" "[:lower:]")
+          IMAGE_NAME="rocket.chat"
           if [[ '${{ matrix.release }}' = 'preview' ]]; then
-            DOCKER_PATH="${DOCKER_PATH}-mongo"
+            IMAGE_NAME="${IMAGE_NAME}.preview"
           fi;
 
-          DOCKERFILE_PATH="${DOCKER_PATH}/Dockerfile"
+          GH_IMAGE_NAME="ghcr.io/${LOWERCASE_REPOSITORY}/${IMAGE_NAME}:${{ needs.release-versions.outputs.docker-tag }}"
           if [[ '${{ matrix.release }}' = 'alpine' ]]; then
-            DOCKERFILE_PATH="${DOCKERFILE_PATH}.${{ matrix.release }}"
+            GH_IMAGE_NAME="${IMAGE_NAME}.${{ matrix.release }}"
           fi;
 
-          echo "Copy Dockerfile for release: ${{ matrix.release }}"
-          cp $DOCKERFILE_PATH ./Dockerfile
-          if [ -e ${DOCKER_PATH}/entrypoint.sh ]; then
-            cp ${DOCKER_PATH}/entrypoint.sh .
-          fi;
+          echo "GH_IMAGE_NAME: $GH_IMAGE_NAME"
 
-      - name: Build Docker image for tag
-        if: github.event_name == 'release'
-        run: |
-          cd /tmp/build
+          echo "::set-output name=gh-image-name::${GH_IMAGE_NAME}"
 
-          DOCKER_TAG=$GITHUB_REF_NAME
+      - name: Pull Docker image
+        run: docker pull ${{ steps.gh-docker.outputs.gh-image-name }}
 
+      - name: Publish Docker image
+        run: |
           if [[ '${{ matrix.release }}' = 'preview' ]]; then
             IMAGE_NAME="${IMAGE_NAME}.preview"
           fi;
 
+          # 'develop' or 'tag'
+          DOCKER_TAG=$GITHUB_REF_NAME
+
           # append the variant name to docker tag
           if [[ '${{ matrix.release }}' = 'alpine' ]]; then
             DOCKER_TAG="${DOCKER_TAG}-${{ matrix.release }}"
           fi;
 
-          RELEASE="${{ needs.release-versions.outputs.release }}"
-
-          if [[ '${{ matrix.release }}' = 'alpine' ]]; then
-            RELEASE="${RELEASE}-${{ matrix.release }}"
-          fi;
-
           echo "IMAGE_NAME: $IMAGE_NAME"
           echo "DOCKER_TAG: $DOCKER_TAG"
-          echo "RELEASE: $RELEASE"
 
-          # build and push the specific tag version
-          docker build -t $IMAGE_NAME:$DOCKER_TAG .
+          # tag and push the specific tag version
+          docker tag $GH_IMAGE_NAME $IMAGE_NAME:$DOCKER_TAG
           docker push $IMAGE_NAME:$DOCKER_TAG
 
-          if [[ $RELEASE == 'latest' ]]; then
-            if [[ '${{ needs.release-versions.outputs.latest-release }}' == $GITHUB_REF_NAME ]]; then
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            RELEASE="${{ needs.release-versions.outputs.release }}"
+
+            if [[ '${{ matrix.release }}' = 'alpine' ]]; then
+              RELEASE="${RELEASE}-${{ matrix.release }}"
+            fi;
+
+            echo "RELEASE: $RELEASE"
+
+            if [[ $RELEASE == 'latest' ]]; then
+              if [[ '${{ needs.release-versions.outputs.latest-release }}' == $GITHUB_REF_NAME ]]; then
+                docker tag $IMAGE_NAME:$DOCKER_TAG $IMAGE_NAME:$RELEASE
+                docker push $IMAGE_NAME:$RELEASE
+              fi
+            else
               docker tag $IMAGE_NAME:$DOCKER_TAG $IMAGE_NAME:$RELEASE
               docker push $IMAGE_NAME:$RELEASE
             fi
-          else
-            docker tag $IMAGE_NAME:$DOCKER_TAG $IMAGE_NAME:$RELEASE
-            docker push $IMAGE_NAME:$RELEASE
           fi
 
-      - name: Build Docker image for develop
-        if: github.ref == 'refs/heads/develop'
-        run: |
-          cd /tmp/build
-
-          DOCKER_TAG=develop
-
-          if [[ '${{ matrix.release }}' = 'preview' ]]; then
-            IMAGE_NAME="${IMAGE_NAME}.preview"
-          fi;
-
-          if [[ '${{ matrix.release }}' = 'alpine' ]]; then
-            DOCKER_TAG="${DOCKER_TAG}-${{ matrix.release }}"
-          fi;
-
-          docker build -t $IMAGE_NAME:$DOCKER_TAG .
-          docker push $IMAGE_NAME:$DOCKER_TAG
-
-  services-image-build:
+  services-docker-image-publish:
     runs-on: ubuntu-20.04
     needs: [deploy, release-versions]
 
@@ -777,57 +870,35 @@ jobs:
         service: ['account', 'authorization', 'ddp-streamer', 'presence', 'stream-hub']
 
     steps:
-      - uses: actions/checkout@v3
-
-      - name: Use Node.js 14.18.3
-        uses: actions/setup-node@v3
-        with:
-          node-version: '14.18.3'
-      - uses: c-hive/gha-yarn-cache@v2
-      - name: Cache turbo
-        id: cache-turbo
-        uses: actions/cache@v2
-        with:
-          path: |
-            ./node_modules/.turbo
-          key: ${{ runner.OS }}-turbo-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-turbo-
-            ${{ runner.os }}-
-
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASS }}
 
-      - name: Build Docker images
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ secrets.CR_USER }}
+          password: ${{ secrets.CR_PAT }}
+
+      - name: Publish Docker images
         run: |
-          # defines image tag
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-            IMAGE_TAG="${GITHUB_REF#refs/tags/}"
-          else
-            IMAGE_TAG="${GITHUB_REF#refs/heads/}"
-          fi
+          LOWERCASE_REPOSITORY=$(echo "${{ github.repository_owner }}" | tr "[:upper:]" "[:lower:]")
 
-          # first install repo dependencies
-          yarn
-          yarn build
+          IMAGE_TAG="${{ needs.release-versions.outputs.docker-tag }}"
 
-          echo "Building Docker image for service: ${{ matrix.service }}:${IMAGE_TAG}"
+          GH_IMAGE_NAME="ghcr.io/${LOWERCASE_REPOSITORY}/${{ matrix.service }}-service:${IMAGE_TAG}"
 
-          if [[ "${{ matrix.service }}" == "ddp-streamer" ]]; then
-            DOCKERFILE_PATH="./ee/apps/ddp-streamer/Dockerfile"
-          else
-            DOCKERFILE_PATH="./apps/meteor/ee/server/services/Dockerfile"
-          fi
+          echo "GH_IMAGE_NAME: $GH_IMAGE_NAME"
+
+          docker pull $GH_IMAGE_NAME
 
-          docker build \
-            --build-arg SERVICE=${{ matrix.service }} \
-            -t rocketchat/${{ matrix.service }}-service:${IMAGE_TAG} \
-            -f ${DOCKERFILE_PATH} \
-            .
+          # 'develop' or 'tag'
+          DOCKER_TAG=$GITHUB_REF_NAME
 
+          docker tag $GH_IMAGE_NAME rocketchat/${{ matrix.service }}-service:${IMAGE_TAG}
           docker push rocketchat/${{ matrix.service }}-service:${IMAGE_TAG}
 
           if [[ $GITHUB_REF == refs/tags/* ]]; then
diff --git a/apps/meteor/.docker/Dockerfile.alpine b/apps/meteor/.docker/Dockerfile.alpine
index 0c7bd994e8f..47d5dacd696 100644
--- a/apps/meteor/.docker/Dockerfile.alpine
+++ b/apps/meteor/.docker/Dockerfile.alpine
@@ -12,7 +12,7 @@ RUN set -x \
     && npm install --production \
     # Start hack for sharp...
     && rm -rf npm/node_modules/sharp \
-    && npm install sharp@0.29.3 \
+    && npm install sharp@0.30.4 \
     && mv node_modules/sharp npm/node_modules/sharp \
     # End hack for sharp
     && cd npm \
diff --git a/apps/meteor/.scripts/start.js b/apps/meteor/.scripts/start.js
deleted file mode 100644
index a29e7bb1dbf..00000000000
--- a/apps/meteor/.scripts/start.js
+++ /dev/null
@@ -1,196 +0,0 @@
-#!/usr/bin/env node
-
-const path = require('path');
-const fs = require('fs');
-const { spawn } = require('child_process');
-const net = require('net');
-
-const processes = [];
-
-const baseDir = path.resolve(__dirname, '..');
-const srcDir = path.resolve(baseDir);
-
-const isPortTaken = (port) =>
-	new Promise((resolve, reject) => {
-		const tester = net
-			.createServer()
-			.once('error', (err) => (err.code === 'EADDRINUSE' ? resolve(true) : reject(err)))
-			.once('listening', () => tester.once('close', () => resolve(false)).close())
-			.listen(port);
-	});
-
-const waitPortRelease = (port, count = 0) =>
-	new Promise((resolve, reject) => {
-		isPortTaken(port).then((taken) => {
-			if (!taken) {
-				return resolve();
-			}
-			if (count > 60) {
-				return reject();
-			}
-			console.log('Port', port, 'not released, waiting 1s...');
-			setTimeout(() => {
-				waitPortRelease(port, ++count)
-					.then(resolve)
-					.catch(reject);
-			}, 1000);
-		});
-	});
-
-const appOptions = {
-	env: {
-		PORT: 3000,
-		ROOT_URL: 'http://localhost:3000',
-	},
-};
-
-let killingAllProcess = false;
-function killAllProcesses(mainExitCode) {
-	if (killingAllProcess) {
-		return;
-	}
-	killingAllProcess = true;
-
-	processes.forEach((p) => {
-		console.log('Killing process', p.pid);
-		p.kill();
-	});
-
-	waitPortRelease(appOptions.env.PORT)
-		.then(() => {
-			console.log(`Port ${appOptions.env.PORT} was released, exiting with code ${mainExitCode}`);
-			process.exit(mainExitCode);
-		})
-		.catch((error) => {
-			console.error(`Error waiting port ${appOptions.env.PORT} to be released, exiting with code ${mainExitCode}`);
-			console.error(error);
-			process.exit(mainExitCode);
-		});
-}
-
-function startProcess(opts) {
-	console.log('Starting process', opts.name, opts.command, opts.params, opts.options.cwd);
-	const proc = spawn(opts.command, opts.params, opts.options);
-	processes.push(proc);
-
-	if (opts.onData) {
-		proc.stdout.on('data', opts.onData);
-	}
-
-	if (!opts.silent) {
-		proc.stdout.pipe(process.stdout);
-		proc.stderr.pipe(process.stderr);
-	}
-
-	if (opts.logFile) {
-		const logStream = fs.createWriteStream(opts.logFile, { flags: 'a' });
-		proc.stdout.pipe(logStream);
-		proc.stderr.pipe(logStream);
-	}
-
-	proc.on('exit', function (code, signal) {
-		processes.splice(processes.indexOf(proc), 1);
-
-		if (code != null) {
-			console.log(opts.name, `exited with code ${code}`);
-		} else {
-			console.log(opts.name, `exited with signal ${signal}`);
-		}
-
-		killAllProcesses(code);
-	});
-}
-
-function startRocketChat() {
-	return new Promise((resolve) => {
-		const waitServerRunning = (message) => {
-			if (message.toString().match('SERVER RUNNING')) {
-				return resolve();
-			}
-		};
-
-		startProcess({
-			name: 'Meteor App',
-			command: 'node',
-			params: ['/tmp/build-test/bundle/main.js'],
-			onData: waitServerRunning,
-			options: {
-				cwd: srcDir,
-				env: {
-					...appOptions.env,
-					...process.env,
-				},
-			},
-		});
-	});
-}
-
-async function startMicroservices() {
-	const waitStart = (resolve) => (message) => {
-		if (message.toString().match('NetworkBroker started successfully')) {
-			return resolve();
-		}
-	};
-	const startService = (name) => {
-		return new Promise((resolve) => {
-			const cwd =
-				name === 'ddp-streamer'
-					? path.resolve(srcDir, '..', '..', 'ee', 'apps', name, 'dist', 'ee', 'apps', name)
-					: path.resolve(srcDir, 'ee', 'server', 'services', 'dist', 'ee', 'server', 'services', name);
-
-			startProcess({
-				name: `${name} service`,
-				command: 'node',
-				params: [name === 'ddp-streamer' ? 'src/service.js' : 'service.js'],
-				onData: waitStart(resolve),
-				options: {
-					cwd,
-					env: {
-						...appOptions.env,
-						...process.env,
-						PORT: 4000,
-					},
-				},
-			});
-		});
-	};
-
-	await Promise.all([
-		startService('account'),
-		startService('authorization'),
-		startService('ddp-streamer'),
-		startService('presence'),
-		startService('stream-hub'),
-	]);
-}
-
-function startTests(options = []) {
-	const testOption = options.find((i) => i.startsWith('--test='));
-	const testParam = testOption ? testOption.replace('--test=', '') : 'test';
-
-	console.log(`Running test "npm run ${testParam}"`);
-
-	startProcess({
-		name: 'Tests',
-		command: 'npm',
-		params: ['run', testParam],
-		options: {
-			env: {
-				...process.env,
-				NODE_PATH: `${process.env.NODE_PATH + path.delimiter + srcDir + path.delimiter + srcDir}/node_modules`,
-			},
-		},
-	});
-}
-
-(async () => {
-	const [, , ...options] = process.argv;
-
-	await startRocketChat();
-
-	if (options.includes('--enterprise')) {
-		await startMicroservices();
-	}
-
-	startTests(options);
-})();
diff --git a/apps/meteor/app/api/server/v1/teams.ts b/apps/meteor/app/api/server/v1/teams.ts
index 157f1ac6d89..5e82084e609 100644
--- a/apps/meteor/app/api/server/v1/teams.ts
+++ b/apps/meteor/app/api/server/v1/teams.ts
@@ -141,11 +141,9 @@ API.v1.addRoute(
 				});
 			}
 
-			await Promise.all([
-				Team.unsetTeamIdOfRooms(this.userId, team._id),
-				Team.removeAllMembersFromTeam(team._id),
-				Team.deleteById(team._id),
-			]);
+			await Promise.all([Team.unsetTeamIdOfRooms(this.userId, team._id), Team.removeAllMembersFromTeam(team._id)]);
+
+			await Team.deleteById(team._id);
 
 			return API.v1.success();
 		},
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index b4490100493..2afada256b3 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -31,9 +31,7 @@
 		"typecheck": "cross-env NODE_OPTIONS=\"--max-old-space-size=8184\" tsc --noEmit --skipLibCheck",
 		"deploy": "npm run build && pm2 startOrRestart pm2.json",
 		"coverage": "nyc -r html mocha --config ./.mocharc.js",
-		"testci": "node .scripts/start.js",
 		"test:playwright": "playwright test",
-		"test:playwright:ee": "cross-env ENTERPRISE=true yarn test:playwright",
 		"testapi": "mocha --config ./.mocharc.api.js",
 		"testunit": "npm run .testunit:definition && npm run .testunit:client && npm run .testunit:server",
 		".testunit:server": "mocha --config ./.mocharc.js",
diff --git a/apps/meteor/server/services/team/service.ts b/apps/meteor/server/services/team/service.ts
index 44415277f5d..9ed9fce67d4 100644
--- a/apps/meteor/server/services/team/service.ts
+++ b/apps/meteor/server/services/team/service.ts
@@ -801,13 +801,10 @@ export class TeamService extends ServiceClassInternal implements ITeamService {
 	}
 
 	async removeAllMembersFromTeam(teamId: string): Promise<void> {
-		const team = await this.TeamModel.findOneById(teamId);
-
-		if (!team) {
-			return;
+		if (!teamId) {
+			throw new Error('missing-teamId');
 		}
-
-		await this.TeamMembersModel.deleteByTeamId(team._id);
+		await this.TeamMembersModel.deleteByTeamId(teamId);
 	}
 
 	async addMember(inviter: Pick<IUser, '_id' | 'username'>, userId: string, teamId: string): Promise<boolean> {
diff --git a/apps/meteor/tests/e2e/utils/configs/verifyTestBaseUrl.ts b/apps/meteor/tests/e2e/utils/configs/verifyTestBaseUrl.ts
index 32e42d34056..6e2cb09c199 100644
--- a/apps/meteor/tests/e2e/utils/configs/verifyTestBaseUrl.ts
+++ b/apps/meteor/tests/e2e/utils/configs/verifyTestBaseUrl.ts
@@ -2,9 +2,6 @@ const getBaseUrl = (): string => {
 	if (process.env.BASE_URL) {
 		return process.env.BASE_URL;
 	}
-	if (process.env.ENTERPRISE) {
-		return 'http://localhost:4000';
-	}
 
 	return 'http://localhost:3000';
 };