diff --git a/.github/workflows/ci-test-backend.yaml b/.github/workflows/ci-test-backend.yaml
index 610a254d..5335aa08 100644
--- a/.github/workflows/ci-test-backend.yaml
+++ b/.github/workflows/ci-test-backend.yaml
@@ -20,8 +20,5 @@ jobs:
       - name: Running tests
         working-directory: ./backend
         run: bash ./run_tests.sh
-
-      - name: Run linting
-        working-directory: ./backend
-        run: find . -type f -name "*.py" | xargs pylint 
+        
         
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
deleted file mode 100644
index bd101643..00000000
--- a/.github/workflows/ci-tests.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-name: UGent-3
-run-name: ${{ github.actor }} is running tests 🚀
-on: [pull_request]
-jobs:
-  Frontend-tests:
-    runs-on: self-hosted
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-
-      - name: Cache dependencies
-        uses: actions/cache@v4
-        with:
-          path: ~/.npm
-          key: npm-${{ hashFiles('package-lock.json') }}
-          restore-keys: npm-
-          
-      - name: Install dependencies
-        working-directory: ./frontend
-        run: npm ci
-      
-      - name: Build
-        working-directory: ./frontend
-        run: npm run build
-      
-      - name: Preview Web App
-        working-directory: ./frontend
-        run: npm run preview &
-
-      - name: Running tests
-        working-directory: ./frontend
-        run: npm test
-      
-      - name: Run linting
-        working-directory: ./frontend
-        run: npm run lint
-  Backend-tests:
-    runs-on: self-hosted
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.x'
-          cache: 'pip'
-
-      - name: Install dependencies
-        working-directory: ./backend
-        run: pip3 install -r requirements.txt && pip3 install -r dev-requirements.txt
-      
-      - name: Running tests
-        working-directory: ./backend
-        run: bash ./run_tests.sh
-
-      - name: Run linting
-        working-directory: ./backend
-        run: find . -type f -name "*.py" | xargs pylint 
-
-