diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index a44c1ea9c3..0c310b5b50 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   db:
-    image: postgres:15
+    image: postgres:17
     restart: unless-stopped
     ports:
       - 5432/tcp
diff --git a/.github/workflows/qc_checks.yaml b/.github/workflows/qc_checks.yaml
index 61159f6a8f..dbc78523a1 100644
--- a/.github/workflows/qc_checks.yaml
+++ b/.github/workflows/qc_checks.yaml
@@ -397,7 +397,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:14
+        image: postgres:17
         env:
           POSTGRES_USER: inventree
           POSTGRES_PASSWORD: password
@@ -492,7 +492,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:14
+        image: postgres:17
         env:
           POSTGRES_USER: inventree
           POSTGRES_PASSWORD: password
@@ -588,7 +588,7 @@ jobs:
     if: needs.paths-filter.outputs.frontend == 'true' || needs.paths-filter.outputs.force == 'true'
     services:
       postgres:
-        image: postgres:15
+        image: postgres:17
         env:
           POSTGRES_DB: inventree
           POSTGRES_USER: inventree_user
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 0ca7416024..1d8096cc23 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -360,7 +360,7 @@ extra:
   min_python_version: 3.10
   min_invoke_version: 2.0.0
   django_version: 5.2
-  docker_postgres_version: 16
+  docker_postgres_version: 17
 
   version:
     default: stable