diff --git a/.github/workflows/cortex-cpp-quality-gate.yml b/.github/workflows/cortex-cpp-quality-gate.yml
index 3c9eea724..85050581a 100644
--- a/.github/workflows/cortex-cpp-quality-gate.yml
+++ b/.github/workflows/cortex-cpp-quality-gate.yml
@@ -188,40 +188,40 @@ jobs:
           AWS_SECRET_ACCESS_KEY: "${{ secrets.MINIO_SECRET_ACCESS_KEY }}"
           AWS_DEFAULT_REGION: "${{ secrets.MINIO_REGION }}"
 
-  build-docker-and-test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Getting the repo
-        uses: actions/checkout@v3
-        with:
-          submodules: 'recursive'
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+  # build-docker-and-test:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Getting the repo
+  #       uses: actions/checkout@v3
+  #       with:
+  #         submodules: 'recursive'
+
+  #     - name: Set up QEMU
+  #       uses: docker/setup-qemu-action@v3
+
+  #     - name: Set up Docker Buildx
+  #       uses: docker/setup-buildx-action@v3
       
-      - name: Run Docker
-        run: |
-          docker build -t menloltd/cortex:test -f docker/Dockerfile .
-          docker run -it -d -p 3928:39281 --name cortex menloltd/cortex:test
-
-      - name: use python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.10"
-
-      - name: Run e2e tests
-        run: |
-          cd engine
-          python -m pip install --upgrade pip
-          python -m pip install -r e2e-test/requirements.txt
-          pytest e2e-test/test_api_docker.py
-
-      - name: Run Docker
-        continue-on-error: true
-        if: always()  
-        run: |
-          docker stop cortex
-          docker rm cortex
+  #     - name: Run Docker
+  #       run: |
+  #         docker build -t menloltd/cortex:test -f docker/Dockerfile .
+  #         docker run -it -d -p 3928:39281 --name cortex menloltd/cortex:test
+
+  #     - name: use python
+  #       uses: actions/setup-python@v5
+  #       with:
+  #         python-version: "3.10"
+
+  #     - name: Run e2e tests
+  #       run: |
+  #         cd engine
+  #         python -m pip install --upgrade pip
+  #         python -m pip install -r e2e-test/requirements.txt
+  #         pytest e2e-test/test_api_docker.py
+
+  #     - name: Run Docker
+  #       continue-on-error: true
+  #       if: always()  
+  #       run: |
+  #         docker stop cortex
+  #         docker rm cortex
diff --git a/engine/e2e-test/test_api_model_start.py b/engine/e2e-test/test_api_model_start.py
index fddb33518..830d32da8 100644
--- a/engine/e2e-test/test_api_model_start.py
+++ b/engine/e2e-test/test_api_model_start.py
@@ -8,6 +8,7 @@ class TestApiModelStart:
     @pytest.fixture(autouse=True)
     def setup_and_teardown(self):
         # Setup
+        stop_server()
         success = start_server()
         if not success:
             raise Exception("Failed to start server")
diff --git a/engine/e2e-test/test_api_model_stop.py b/engine/e2e-test/test_api_model_stop.py
index 315f51ef8..97bec671e 100644
--- a/engine/e2e-test/test_api_model_stop.py
+++ b/engine/e2e-test/test_api_model_stop.py
@@ -8,6 +8,7 @@ class TestApiModelStop:
     @pytest.fixture(autouse=True)
     def setup_and_teardown(self):
         # Setup
+        stop_server()
         success = start_server()
         if not success:
             raise Exception("Failed to start server")