diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1565bc..c63cb8d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ build:java:
   stage: build
   image: eclipse-temurin:21-jdk
   services:
-    - postgres:16-alpine
+    - postgres:17-alpine
   variables:
     POSTGRES_DB: mtgsearch_build
     POSTGRES_USER: postgres
@@ -69,7 +69,7 @@ test:integration:
   stage: test
   image: eclipse-temurin:21-jdk
   services:
-    - postgres:16-alpine
+    - postgres:17-alpine
   variables:
     POSTGRES_DB: mtgsearch_test
     POSTGRES_USER: postgres
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 50b4567..38b1c0b 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -67,7 +67,7 @@ docker run --name mtgsearch-postgres \
   -e POSTGRES_USER=postgres \
   -e POSTGRES_PASSWORD=postgres \
   -p 5432:5432 \
-  -d postgres:16-alpine
+  -d postgres:17-alpine
 ```
 
 **Using Local PostgreSQL:**
diff --git a/Makefile b/Makefile
index 8af07e4..539c097 100644
--- a/Makefile
+++ b/Makefile
@@ -111,7 +111,7 @@ db-init:
 		-e POSTGRES_USER=postgres \
 		-e POSTGRES_PASSWORD=postgres \
 		-p 5432:5432 \
-		-d postgres:16-alpine
+		-d postgres:17-alpine
 	@echo "✓ Database initialized on localhost:5432"
 
 .DEFAULT_GOAL := help
diff --git a/README.md b/README.md
index 2541ed9..f1d8ca1 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ docker run --name mtgsearch-postgres \
   -e POSTGRES_USER=postgres \
   -e POSTGRES_PASSWORD=postgres \
   -p 5432:5432 \
-  -d postgres:16-alpine
+  -d postgres:17-alpine
 
 # Or use your local PostgreSQL installation
 ```
diff --git a/backend/src/test/java/net/moustos/mtgsearch/AuthServiceTest.java b/backend/src/test/java/net/moustos/mtgsearch/AuthServiceTest.java
index a0d6928..4255f61 100644
--- a/backend/src/test/java/net/moustos/mtgsearch/AuthServiceTest.java
+++ b/backend/src/test/java/net/moustos/mtgsearch/AuthServiceTest.java
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Disabled;
 public class AuthServiceTest {
 
     @Container
-    static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:16-alpine")
+    static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:17-alpine")
             .withDatabaseName("mtgsearch_test")
             .withUsername("postgres")
             .withPassword("postgres");
diff --git a/backend/src/test/java/net/moustos/mtgsearch/UserRepositoryTest.java b/backend/src/test/java/net/moustos/mtgsearch/UserRepositoryTest.java
index cb6f9c4..74a7c55 100644
--- a/backend/src/test/java/net/moustos/mtgsearch/UserRepositoryTest.java
+++ b/backend/src/test/java/net/moustos/mtgsearch/UserRepositoryTest.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Disabled;
 public class UserRepositoryTest {
 
     @Container
-    static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:16-alpine")
+    static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:17-alpine")
             .withDatabaseName("mtgsearch_test")
             .withUsername("postgres")
             .withPassword("postgres");
diff --git a/startup.sh b/startup.sh
index 876f71d..98306d5 100644
--- a/startup.sh
+++ b/startup.sh
@@ -62,7 +62,7 @@ setup_database() {
                 -e POSTGRES_USER=postgres \
                 -e POSTGRES_PASSWORD=postgres \
                 -p 5432:5432 \
-                -d postgres:16-alpine
+                -d postgres:17-alpine
             
             echo -e "${BLUE}Waiting for PostgreSQL to be ready...${NC}"
             sleep 10