diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8429e1f..3edfbe6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,11 +17,11 @@ jobs:
             fail-fast: false
             matrix:
                 include:
-                  - os: ubuntu-22.04
+                  - os: ubuntu-24.04
                     make: test-debug
                     info: g++-11 + test-debug
 
-                  - os: ubuntu-22.04
+                  - os: ubuntu-24.04
                     make: test-release
                     info: g++-11 + test-release
 
@@ -49,10 +49,10 @@ jobs:
                 sudo apt install --allow-downgrades -y postgresql $(wget -q -O - ${DEPS_FILE})
                 python3 -m pip install -r requirements.txt
 
-          - name: Reinstall postgres 14
+          - name: Reinstall postgres 16
             run: |
                 sudo apt purge libpq5 libpq-dev postgresql-*
-                sudo apt install -y postgresql-14 postgresql-client-14 postgresql-server-dev-14
+                sudo apt install -y postgresql-16 postgresql-client-16 postgresql-server-dev-16
 
           - name: Setup ccache
             run: |
diff --git a/docker-compose.yml b/docker-compose.yml
index 4841ba3..c5f2dff 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,7 +17,7 @@ services:
           - postgres
 
     service_template-container:
-        image: ghcr.io/userver-framework/ubuntu-22.04-userver-pg:latest
+        image: ghcr.io/userver-framework/ubuntu-24.04-userver:latest
         privileged: true
         environment:
           <<: *db_env