diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index fb6aa8a..66b5cfd 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -9,7 +9,20 @@ updates:
     directory: "/client" # Location of package manifests
     schedule:
       interval: "daily"
+
+  - package-ecosystem: "pip" # See documentation for possible values
+    directory: "/server" # Location of package manifests
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/client" # Location of package manifests
+    target-branch: "develop"
+    schedule:
+      interval: "daily"
+
   - package-ecosystem: "pip" # See documentation for possible values
     directory: "/server" # Location of package manifests
+    target-branch: "develop"
     schedule:
       interval: "daily"
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
deleted file mode 100644
index c0ef70f..0000000
--- a/.github/workflows/lint.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-name: "Lint"
-
-on: [ push, pull_request ]
-
-jobs:
-  lint:
-    name: "Lint"
-    uses: superdesk/newsroom-app/.github/workflows/lint.yml@develop
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a50f80e..a66f697 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -6,70 +6,13 @@ on:
 jobs:
 
   server:
-    runs-on: ubuntu-latest
+    uses: superdesk/newsroom-app/.github/workflows/server.yml@develop
 
-    services:
-      redis:
-        image: redis:alpine
-        ports:
-            - "6379:6379"
-
-      mongo:
-        image: mongo:3.6
-        ports:
-            - "27017:27017"
-
-      elastic:
-        image: docker.elastic.co/elasticsearch/elasticsearch:7.6.2
-        ports:
-            - "9200:9200"
-        env:
-            discovery.type: single-node
-
-    defaults:
-      run:
-        working-directory: server
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: setup python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.10'
-
-      - run: sudo apt-get update && sudo apt-get -y install libxml2-dev libxmlsec1-dev libxmlsec1-openssl
-
-      - name: pip install
-        run: |
-          python -m pip install --upgrade pip wheel setuptools
-          pip install -r dev-requirements.txt
-
-      - name: pytest
-        run: pytest --disable-pytest-warnings --cov=./
-
-      - name: behave
-        run: behave --format progress2 --logging-level=ERROR
+  pytest:
+    uses: superdesk/newsroom-app/.github/workflows/pytest.yml@develop
 
+  behave:
+    uses: superdesk/newsroom-app/.github/workflows/behave.yml@develop
 
   client:
-    runs-on: ubuntu-latest
-
-    defaults:
-      run:
-        working-directory: client
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: '14.x'
-
-      - run: git config --global url."https://git@".insteadOf git://
-
-      - name: install
-        run: npm ci || npm install
-
-      - name: build
-        run: npm run build
+    uses: superdesk/newsroom-app/.github/workflows/client.yml@develop
diff --git a/server/dev-requirements.txt b/server/dev-requirements.txt
index f693d7f..016a5ce 100644
--- a/server/dev-requirements.txt
+++ b/server/dev-requirements.txt
@@ -1,12 +1,12 @@
 -r requirements.txt
 -r mypy-requirements.txt
 
-flake8
-sphinx
-sphinx-autobuild
-pytest
-pytest-cov
-pytest-mock
-responses
-httmock
-wooper
+behave==1.2.6
+black==24.10.0
+flake8==7.1.1
+pytest==8.3.4
+pytest-cov==6.0.0
+pytest-mock==3.14.0
+responses==0.25.3
+httmock==1.4.0
+wooper==0.4.4