diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 892da903..e06283ae 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -179,7 +179,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgres:16-alpine
+        image: postgres:18-alpine
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index c4fe6272..4a302dc3 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgres:16-alpine
+        image: postgres:18-alpine
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
diff --git a/justfile b/justfile
index 893b6070..496ea08e 100644
--- a/justfile
+++ b/justfile
@@ -41,6 +41,7 @@ test-integration:
     DATABASE_URL='postgres://oxicloud_test:oxicloud_test@localhost:5433/oxicloud_test' \
       RUSTFLAGS='--cfg integration_tests' \
       cargo test --workspace --tests
+    bash tests/common/stop-db.sh
 
 test-one name:
     cargo test {{name}}