diff --git a/.github/workflows/image_scan.yml b/.github/workflows/image_scan.yml
new file mode 100644
index 000000000..01a446377
--- /dev/null
+++ b/.github/workflows/image_scan.yml
@@ -0,0 +1,20 @@
+name: scan_image_for_CVE
+on:
+  push:
+    # Every week on Monday at 00:00
+    schedule:
+     - cron: "0 0 * * 1"
+jobs:
+  build_push_image:
+    name: Build Docker Image then Push it to Docker.io
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run Trivy vulnerability scanner
+        uses: aquasecurity/trivy-action@v0.36.0
+	with:
+          image-ref: 'codalab/codabench-compute-worker:latest'
+          format: 'table'
+          exit-code: '1'
+          ignore-unfixed: true
+          vuln-type: 'os,library'
+          severity: 'CRITICAL,HIGH'
diff --git a/.github/workflows/tests.yml.DISABLED b/.github/workflows/tests.yml.DISABLED
index 91e5ee27a..29992eafe 100644
--- a/.github/workflows/tests.yml.DISABLED
+++ b/.github/workflows/tests.yml.DISABLED
@@ -3,33 +3,33 @@ on: [push]
 jobs:
   build:
     name: Build necessary services
-    # runs-on: self-hosted
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - name: Check out repository code
         uses: actions/checkout@v5
+
       - name: "Setup: Copy environment variables"
         run: cp .env_circleci .env
+
       - name: "Setup: Create directories for MinIO (cannot be made by docker for some reason)"
         run: | 
-         mkdir -p var/minio/public
-         mkdir -p var/minio/private
+            mkdir -p var/minio/public
+            mkdir -p var/minio/private
+
       - name: "Setup: Prepare the playwright environment"
         run: |
-            cd playwrightPython
+            cd tests
             curl -LsSf https://astral.sh/uv/install.sh | sh
-            $HOME/.local/bin/uv sync
+            $HOME/.local/bin/uv sync --frozen
             $HOME/.local/bin/uv run playwright install
-      - name: "Docker: Build containers and collect static files"
+      - name: "Docker: Build containers"
         run: |
-            docker compose -f docker-compose.yml -f docker-compose.selenium.yml up -d
-            docker compose -f docker-compose.yml -f docker-compose.selenium.yml exec django python manage.py collectstatic --noinput
-            docker compose -f docker-compose.yml -f docker-compose.selenium.yml exec django python manage.py migrate
-            docker compose -f docker-compose.yml exec django python ./manage.py createsuperuser --no-input
-      - name: "Docker: Pull required images"
+            docker compose up -d
+
+      - name: "Get compute worker, site worker and django logs"
         run: |
-            docker pull codalab/codalab-legacy:py37
-            docker pull codalab/codalab-legacy:py3
+            mkdir dockerLogs
+            docker compose logs -f site_worker compute_worker django > dockerLogs/django_workers.log &
   linter:
     name: Flake8 linter
     runs-on: self-hosted
@@ -38,26 +38,47 @@ jobs:
       - name: "Lint: Check code style with flake8"
         run: docker compose exec django flake8 src/
   unit_tests:
-    name: Unit test with Selenium
+    name: Unit tests
     runs-on: self-hosted
     needs: [linter,build]
     steps:
       - name: "Tests: Run unit/integration tests (excluding e2e)"
-        run: docker compose -f docker-compose.yml -f docker-compose.selenium.yml exec django py.test src/ -m "not e2e"
+        run: docker compose exec django py.test src/ -m "not e2e"
   e2e:
     name: End to End tests with Playwright
     runs-on: self-hosted
     needs: [linter,build]
     steps:
       - name: "Tests: Run end-to-end (E2E) tests"
-        run: cd playwrightPython && $HOME/.local/bin/uv run pytest test_auth.py test_account_creation.py test_competition.py test_submission.py
+        run: |
+            docker compose exec django python ./manage.py createsuperuser --no-input
+            docker compose exec django python ./manage.py collectstatic --no-input
+            docker compose exec django python ./manage.py migrate --no-input
+            cd tests && CI=True $HOME/.local/bin/uv run pytest test_auth.py test_account_creation.py test_competition.py test_submission.py
+  artifacts:
+      name: "Store Artifacts"
+      runs-on: self-hosted
+      needs: [linter,build,unit_tests,e2e]
+      steps:
+        - name: "Docker logs"
+          uses: actions/upload-artifact@v4
+          with:
+            name: "Docker logs"
+            path: |
+              dockerLogs/
+        - name: "Playwright results (on-failure)"
+          uses: actions/upload-artifact@v4
+          with:
+            name: "Playwright results (on-failure)"
+            path: |
+              tests/test-results
   cleanup:
     name: Cleanup
     runs-on: self-hosted
     if: ${{ always() }}
-    needs: [unit_tests,e2e,linter]
+    needs: [unit_tests,e2e,linter,artifacts]
     steps:
       - name: Cleanup
         run: |
-            docker compose -f docker-compose.yml -f docker-compose.selenium.yml down --rmi all
+            docker compose down --rmi all
             rm -rf ${{ github.workspace }}/* 
\ No newline at end of file