diff --git a/backend/app/src/main/kotlin/io/tolgee/postgresRunners/PostgresDockerRunner.kt b/backend/app/src/main/kotlin/io/tolgee/postgresRunners/PostgresDockerRunner.kt
index 80f5572137..9ebfe52238 100644
--- a/backend/app/src/main/kotlin/io/tolgee/postgresRunners/PostgresDockerRunner.kt
+++ b/backend/app/src/main/kotlin/io/tolgee/postgresRunners/PostgresDockerRunner.kt
@@ -14,7 +14,7 @@ class PostgresDockerRunner(
   override fun run() {
     instance =
       DockerContainerRunner(
-        image = "postgres:16.3",
+        image = "postgres:16.8",
         expose = mapOf(postgresAutostartProperties.port to "5432"),
         waitForLog = "database system is ready to accept connections",
         waitForLogTimesForNewContainer = 2,
diff --git a/build.gradle b/build.gradle
index 243bc90e98..7ef16e53a3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -90,7 +90,12 @@ project(':server-app').afterEvaluate {
     task startDbChangelogContainer {
         doLast {
             exec {
-                commandLine "docker", "run", "-e", "POSTGRES_PASSWORD=postgres", "-d", "-p55538:5432", "--name", dbSchemaContainerName, "postgres:13"
+                commandLine "docker", "run",
+                        "-e", "POSTGRES_PASSWORD=postgres",
+                        "-d",
+                        "-p55538:5432",
+                        "--name", dbSchemaContainerName,
+                        "postgres:16.8"
             }
             Thread.sleep(5000)
         }
diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile
index f9c635dffe..7c22225dd4 100644
--- a/docker/app/Dockerfile
+++ b/docker/app/Dockerfile
@@ -1,9 +1,18 @@
-FROM postgres:13.20-alpine3.21
+FROM postgres:16.8
 
 ENTRYPOINT []
 
-RUN apk --no-cache add openjdk21
-RUN apk --no-cache add "libxml2>=2.13.4-r5"
+RUN <<EOF
+  set -eux
+  apt -qq update
+  apt -qq -y install wget
+  wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor | tee /etc/apt/trusted.gpg.d/adoptium.gpg > /dev/null
+  echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
+  apt -qq update
+  apt -qq -y install temurin-21-jdk libxml2
+  apt -qq -y remove wget --purge --auto-remove
+  rm -rf /var/lib/apt/lists/*
+EOF
 
 #############
 ### Tolgee  #
diff --git a/docker/docker-compose.template.yml b/docker/docker-compose.template.yml
index ff1d5a98ea..ef63e41331 100644
--- a/docker/docker-compose.template.yml
+++ b/docker/docker-compose.template.yml
@@ -1,6 +1,6 @@
 services:
   db:
-    image: postgres:11
+    image: postgres:16.8
     environment:
       - POSTGRES_PASSWORD=postgres
   app:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 3753a3a7c8..7e28ab9aa8 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   db:
-    image: postgres:11
+    image: postgres:16.8
     volumes:
       - ../build/db-data:/var/lib/postgresql/data/
     environment:
@@ -14,4 +14,4 @@ services:
     depends_on:
       - "db"
   smtp:
-    image: namshi/smtp
\ No newline at end of file
+    image: namshi/smtp