diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
index 0b6d735..638c222 100644
--- a/.github/workflows/base.yml
+++ b/.github/workflows/base.yml
@@ -19,13 +19,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ["next", "2024.2", "2024.3", "2025.1"]
-        group: ["default", "more", "clang"]
-        include:
-          - version: "next"
-            group: "ruby"
-          - version: "2024.3"
-            group: "ruby"
+        version: ["next", "2025.1"]
+        group: ["default", "more", "clang", "ruby"]
     runs-on: ubuntu-latest
     steps:
       - name: Clean up
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 78fa314..66a22a2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,35 +13,35 @@ on:
     - cron: '0 0 * * 1'
 
 jobs:
-#  build243:
-#    name: "2024.3"
-#    strategy:
-#      matrix:
-#        platform: [ linux/amd64 ]  # linux/arm64
-#        linter: [ android-community, android, dotnet, go, js, jvm, jvm-community, php, python, python-community, dotnet-community, cpp, cnova ]
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Checkout
-#        uses: actions/checkout@v4
-#      - uses: dorny/paths-filter@v3
-#        id: changes
-#        with:
-#          filters: |
-#            dockerfile:
-#              - '2024.3/${{ matrix.linter }}/Dockerfile'
-#      - if: steps.changes.outputs.dockerfile == 'true'
-#        name: Set up Docker Buildx
-#        uses: docker/setup-buildx-action@v3
-#      - if: steps.changes.outputs.dockerfile == 'true'
-#       name: Build
-#        uses: docker/build-push-action@v6
-#        with:
-#          tags: jetbrains/qodana-${{ matrix.linter }}:2024.3
-#          context: 2024.3/${{ matrix.linter }}
-#          platforms: ${{ matrix.platform }}
-#          push: false
-#          cache-from: type=gha
-#          cache-to: type=gha,mode=max,ignore-error=true
+  build243:
+    name: "2024.3"
+    strategy:
+      matrix:
+        platform: [ linux/amd64 ]  # linux/arm64
+        linter: [ android-community, android, dotnet, go, js, jvm, jvm-community, php, python, python-community, dotnet-community, cpp, cnova ]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - uses: dorny/paths-filter@v3
+        id: changes
+        with:
+          filters: |
+            dockerfile:
+              - '2024.3/${{ matrix.linter }}/Dockerfile'
+      - if: steps.changes.outputs.dockerfile == 'true'
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - if: steps.changes.outputs.dockerfile == 'true'
+        name: Build
+        uses: docker/build-push-action@v6
+        with:
+          tags: jetbrains/qodana-${{ matrix.linter }}:2024.3
+          context: 2024.3/${{ matrix.linter }}
+          platforms: ${{ matrix.platform }}
+          push: false
+          cache-from: type=gha
+          cache-to: type=gha,mode=max,ignore-error=true
 
   build242:
     name: "2024.2"
diff --git a/2024.3/base/docker-bake.hcl b/2024.3/base/docker-bake.hcl
index 528b2bb..d7c86e9 100644
--- a/2024.3/base/docker-bake.hcl
+++ b/2024.3/base/docker-bake.hcl
@@ -15,7 +15,7 @@ group "clang" {
 }
 
 group "ruby" {
-  targets = ["ruby2x", "ruby3x"]
+  targets = []
 }
 
 target "debian" {
diff --git a/2025.1/base/README.md b/2025.1/base/README.md
index 7c6c39f..256d79f 100644
--- a/2025.1/base/README.md
+++ b/2025.1/base/README.md
@@ -52,7 +52,7 @@ With `--print` option in the previous command you'll get the full picture of ima
       },
       "dockerfile": "debian.js.Dockerfile",
       "args": {
-        "NODE_TAG": "20-bullseye-slim"
+        "NODE_TAG": "20-bookworm-slim"
       },
       "tags": [
         "registry.jetbrains.team/p/sa/containers/qodana:debian-js-base"
@@ -67,12 +67,12 @@ With `--print` option in the previous command you'll get the full picture of ima
       "dockerfile": "dotnet.Dockerfile",
       "args": {
         "COMPOSER_TAG": "2.5.1",
-        "DOTNET_TAG": "6.0-bullseye-slim",
-        "GO_TAG": "1.19-bullseye",
-        "NODE_TAG": "20-bullseye-slim",
-        "PHP_TAG": "8.1-cli-bullseye",
-        "RUBY_TAG": "3.0-bullseye",
-        "RUST_TAG": "1.71-slim-bullseye"
+        "DOTNET_TAG": "6.0-bookworm-slim",
+        "GO_TAG": "1.19-bookworm",
+        "NODE_TAG": "20-bookworm-slim",
+        "PHP_TAG": "8.1-cli-bookworm",
+        "RUBY_TAG": "3.0-bookworm",
+        "RUST_TAG": "1.71-slim-bookworm"
       },
       "tags": [
         "registry.jetbrains.team/p/sa/containers/qodana:dotnet-base"
@@ -87,12 +87,12 @@ With `--print` option in the previous command you'll get the full picture of ima
       "dockerfile": "go.Dockerfile",
       "args": {
         "COMPOSER_TAG": "2.5.1",
-        "DOTNET_TAG": "6.0-bullseye-slim",
-        "GO_TAG": "1.19-bullseye",
-        "NODE_TAG": "20-bullseye-slim",
-        "PHP_TAG": "8.1-cli-bullseye",
-        "RUBY_TAG": "3.0-bullseye",
-        "RUST_TAG": "1.71-slim-bullseye"
+        "DOTNET_TAG": "6.0-bookworm-slim",
+        "GO_TAG": "1.19-bookworm",
+        "NODE_TAG": "20-bookworm-slim",
+        "PHP_TAG": "8.1-cli-bookworm",
+        "RUBY_TAG": "3.0-bookworm",
+        "RUST_TAG": "1.71-slim-bookworm"
       },
       "tags": [
         "registry.jetbrains.team/p/sa/containers/qodana:go-base"
@@ -107,12 +107,12 @@ With `--print` option in the previous command you'll get the full picture of ima
       "dockerfile": "js.Dockerfile",
       "args": {
         "COMPOSER_TAG": "2.5.1",
-        "DOTNET_TAG": "6.0-bullseye-slim",
-        "GO_TAG": "1.19-bullseye",
-        "NODE_TAG": "20-bullseye-slim",
-        "PHP_TAG": "8.1-cli-bullseye",
-        "RUBY_TAG": "3.0-bullseye",
-        "RUST_TAG": "1.71-slim-bullseye"
+        "DOTNET_TAG": "6.0-bookworm-slim",
+        "GO_TAG": "1.19-bookworm",
+        "NODE_TAG": "20-bookworm-slim",
+        "PHP_TAG": "8.1-cli-bookworm",
+        "RUBY_TAG": "3.0-bookworm",
+        "RUST_TAG": "1.71-slim-bookworm"
       },
       "tags": [
         "registry.jetbrains.team/p/sa/containers/qodana:js-base"
@@ -127,12 +127,12 @@ With `--print` option in the previous command you'll get the full picture of ima
       "dockerfile": "php.Dockerfile",
       "args": {
         "COMPOSER_TAG": "2.5.1",
-        "DOTNET_TAG": "6.0-bullseye-slim",
-        "GO_TAG": "1.19-bullseye",
-        "NODE_TAG": "20-bullseye-slim",
-        "PHP_TAG": "8.1-cli-bullseye",
-        "RUBY_TAG": "3.0-bullseye",
-        "RUST_TAG": "1.71-slim-bullseye"
+        "DOTNET_TAG": "6.0-bookworm-slim",
+        "GO_TAG": "1.19-bookworm",
+        "NODE_TAG": "20-bookworm-slim",
+        "PHP_TAG": "8.1-cli-bookworm",
+        "RUBY_TAG": "3.0-bookworm",
+        "RUST_TAG": "1.71-slim-bookworm"
       },
       "tags": [
         "registry.jetbrains.team/p/sa/containers/qodana:php-base"
@@ -163,7 +163,7 @@ With `--print` option in the previous command you'll get the full picture of ima
       },
       "dockerfile": "python.js.Dockerfile",
       "args": {
-        "NODE_TAG": "20-bullseye-slim"
+        "NODE_TAG": "20-bookworm-slim"
       },
       "tags": [
         "registry.jetbrains.team/p/sa/containers/qodana:python-js-base"
@@ -178,12 +178,12 @@ With `--print` option in the previous command you'll get the full picture of ima
       "dockerfile": "ruby.Dockerfile",
       "args": {
         "COMPOSER_TAG": "2.5.1",
-        "DOTNET_TAG": "6.0-bullseye-slim",
-        "GO_TAG": "1.19-bullseye",
-        "NODE_TAG": "20-bullseye-slim",
-        "PHP_TAG": "8.1-cli-bullseye",
-        "RUBY_TAG": "3.0-bullseye",
-        "RUST_TAG": "1.71-slim-bullseye"
+        "DOTNET_TAG": "6.0-bookworm-slim",
+        "GO_TAG": "1.19-bookworm",
+        "NODE_TAG": "20-bookworm-slim",
+        "PHP_TAG": "8.1-cli-bookworm",
+        "RUBY_TAG": "3.0-bookworm",
+        "RUST_TAG": "1.71-slim-bookworm"
       },
       "tags": [
         "registry.jetbrains.team/p/sa/containers/qodana:ruby-base"
@@ -198,12 +198,12 @@ With `--print` option in the previous command you'll get the full picture of ima
       "dockerfile": "rust.Dockerfile",
       "args": {
         "COMPOSER_TAG": "2.5.1",
-        "DOTNET_TAG": "6.0-bullseye-slim",
-        "GO_TAG": "1.19-bullseye",
-        "NODE_TAG": "20-bullseye-slim",
-        "PHP_TAG": "8.1-cli-bullseye",
-        "RUBY_TAG": "3.0-bullseye",
-        "RUST_TAG": "1.71-slim-bullseye"
+        "DOTNET_TAG": "6.0-bookworm-slim",
+        "GO_TAG": "1.19-bookworm",
+        "NODE_TAG": "20-bookworm-slim",
+        "PHP_TAG": "8.1-cli-bookworm",
+        "RUBY_TAG": "3.0-bookworm",
+        "RUST_TAG": "1.71-slim-bookworm"
       },
       "tags": [
         "registry.jetbrains.team/p/sa/containers/qodana:rust-base"
diff --git a/2025.1/base/cdnet.Dockerfile b/2025.1/base/cdnet.Dockerfile
index 3f8ff6d..bd909f5 100644
--- a/2025.1/base/cdnet.Dockerfile
+++ b/2025.1/base/cdnet.Dockerfile
@@ -1,4 +1,4 @@
-ARG DOTNET_BASE_TAG="7.0-bullseye-slim"
+ARG DOTNET_BASE_TAG="7.0-bookworm-slim"
 FROM mcr.microsoft.com/dotnet/sdk:$DOTNET_BASE_TAG
 
 ENV HOME="/root" \
diff --git a/2025.1/base/debian.Dockerfile b/2025.1/base/debian.Dockerfile
index 2772576..c65c208 100644
--- a/2025.1/base/debian.Dockerfile
+++ b/2025.1/base/debian.Dockerfile
@@ -1,5 +1,5 @@
-ARG BASE_TAG="bullseye-slim"
-ARG NODE_TAG="22-bullseye-slim"
+ARG BASE_TAG="bookworm-slim"
+ARG NODE_TAG="22-bookworm-slim"
 FROM node:$NODE_TAG AS node_base
 FROM debian:$BASE_TAG
 
diff --git a/2025.1/base/debian.js.Dockerfile b/2025.1/base/debian.js.Dockerfile
index 45c5678..706773d 100644
--- a/2025.1/base/debian.js.Dockerfile
+++ b/2025.1/base/debian.js.Dockerfile
@@ -1,4 +1,4 @@
-ARG NODE_TAG="22-bullseye-slim"
+ARG NODE_TAG="22-bookworm-slim"
 FROM node:$NODE_TAG AS node_base
 FROM debianbase
 
diff --git a/2025.1/base/docker-bake.hcl b/2025.1/base/docker-bake.hcl
index 53bac9a..227997a 100644
--- a/2025.1/base/docker-bake.hcl
+++ b/2025.1/base/docker-bake.hcl
@@ -15,7 +15,7 @@ group "clang" {
 }
 
 group "ruby" {
-  targets = ["ruby2x", "ruby3x"]
+  targets = ["ruby3x"]
 }
 
 target "debian" {
@@ -86,24 +86,9 @@ target "cpp" {
   }
 }
 
-target "ruby2x" {
-  matrix = {
-    version = ["6", "7"]
-  }
-  name = "ruby-base-2${version}-251"
-  tags = [
-    "registry.jetbrains.team/p/sa/containers/qodana:ruby-base-2.${version}-251"
-  ]
-  platforms = ["linux/amd64", "linux/arm64"]
-  dockerfile = "ruby.Dockerfile"
-  args = {
-    RUBY_TAG = "2.${version}-slim-bullseye"
-  }
-}
-
 target "ruby3x" {
   matrix = {
-    version = ["0", "1", "2", "3"]
+    version = ["1", "2", "3"]
   }
   name = "ruby-base-3${version}-251"
   tags = [
@@ -112,6 +97,6 @@ target "ruby3x" {
   platforms = ["linux/amd64", "linux/arm64"]
   dockerfile = "ruby.Dockerfile"
   args = {
-    RUBY_TAG = "3.${version}-slim-bullseye"
+    RUBY_TAG = "3.${version}-slim-bookworm"
   }
 }
\ No newline at end of file
diff --git a/2025.1/base/dotnet.Dockerfile b/2025.1/base/dotnet.Dockerfile
index 9a69d98..6a36258 100644
--- a/2025.1/base/dotnet.Dockerfile
+++ b/2025.1/base/dotnet.Dockerfile
@@ -1,5 +1,5 @@
-ARG NODE_TAG="22-bullseye-slim"
-ARG DOTNET_BASE_TAG="7.0-bullseye-slim"
+ARG NODE_TAG="22-bookworm-slim"
+ARG DOTNET_BASE_TAG="7.0-bookworm-slim"
 FROM node:$NODE_TAG AS node_base
 FROM mcr.microsoft.com/dotnet/sdk:$DOTNET_BASE_TAG
 
diff --git a/2025.1/base/go.Dockerfile b/2025.1/base/go.Dockerfile
index 8147bce..cd3a423 100644
--- a/2025.1/base/go.Dockerfile
+++ b/2025.1/base/go.Dockerfile
@@ -1,5 +1,5 @@
-ARG GO_TAG="1.24-bullseye"
-ARG NODE_TAG="22-bullseye-slim"
+ARG GO_TAG="1.24-bookworm"
+ARG NODE_TAG="22-bookworm-slim"
 FROM node:$NODE_TAG AS node_base
 FROM golang:$GO_TAG
 
diff --git a/2025.1/base/js.Dockerfile b/2025.1/base/js.Dockerfile
index ea29b40..4c58052 100644
--- a/2025.1/base/js.Dockerfile
+++ b/2025.1/base/js.Dockerfile
@@ -1,4 +1,4 @@
-ARG NODE_TAG="22-bullseye-slim"
+ARG NODE_TAG="22-bookworm-slim"
 FROM node:$NODE_TAG
 
 # renovate: datasource=npm depName=eslint
diff --git a/2025.1/base/php.Dockerfile b/2025.1/base/php.Dockerfile
index 679a87d..b1112cc 100644
--- a/2025.1/base/php.Dockerfile
+++ b/2025.1/base/php.Dockerfile
@@ -1,5 +1,5 @@
-ARG NODE_TAG="22-bullseye-slim"
-ARG PHP_TAG="8.4-cli-bullseye"
+ARG NODE_TAG="22-bookworm-slim"
+ARG PHP_TAG="8.4-cli-bookworm"
 ARG COMPOSER_TAG="2.8.5"
 FROM node:$NODE_TAG AS node_base
 FROM composer:$COMPOSER_TAG AS composer_base
diff --git a/2025.1/base/python.js.Dockerfile b/2025.1/base/python.js.Dockerfile
index 2f23d61..2ef6b26 100644
--- a/2025.1/base/python.js.Dockerfile
+++ b/2025.1/base/python.js.Dockerfile
@@ -1,4 +1,4 @@
-ARG NODE_TAG="22-bullseye-slim"
+ARG NODE_TAG="22-bookworm-slim"
 FROM node:$NODE_TAG AS node_base
 FROM pythonbase
 
diff --git a/2025.1/base/ruby.Dockerfile b/2025.1/base/ruby.Dockerfile
index 7fe13fa..d8bfd81 100644
--- a/2025.1/base/ruby.Dockerfile
+++ b/2025.1/base/ruby.Dockerfile
@@ -1,5 +1,5 @@
-ARG NODE_TAG="22-bullseye-slim"
-ARG RUBY_TAG="3.4-slim-bullseye"
+ARG NODE_TAG="22-bookworm-slim"
+ARG RUBY_TAG="3.4-slim-bookworm"
 
 FROM node:$NODE_TAG AS node_base
 FROM ruby:$RUBY_TAG
diff --git a/2025.1/base/rust.Dockerfile b/2025.1/base/rust.Dockerfile
index 4019098..3e02b81 100644
--- a/2025.1/base/rust.Dockerfile
+++ b/2025.1/base/rust.Dockerfile
@@ -1,4 +1,4 @@
-ARG RUST_TAG="1.84-slim-bullseye"
+ARG RUST_TAG="1.84-slim-bookworm"
 FROM rust:$RUST_TAG
 
 # renovate: datasource=npm depName=eslint
diff --git a/next/base/README.md b/next/base/README.md
index 7c6c39f..256d79f 100644
--- a/next/base/README.md
+++ b/next/base/README.md
@@ -52,7 +52,7 @@ With `--print` option in the previous command you'll get the full picture of ima
       },
       "dockerfile": "debian.js.Dockerfile",
       "args": {
-        "NODE_TAG": "20-bullseye-slim"
+        "NODE_TAG": "20-bookworm-slim"
       },
       "tags": [
         "registry.jetbrains.team/p/sa/containers/qodana:debian-js-base"
@@ -67,12 +67,12 @@ With `--print` option in the previous command you'll get the full picture of ima
       "dockerfile": "dotnet.Dockerfile",
       "args": {
         "COMPOSER_TAG": "2.5.1",
-        "DOTNET_TAG": "6.0-bullseye-slim",
-        "GO_TAG": "1.19-bullseye",
-        "NODE_TAG": "20-bullseye-slim",
-        "PHP_TAG": "8.1-cli-bullseye",
-        "RUBY_TAG": "3.0-bullseye",
-        "RUST_TAG": "1.71-slim-bullseye"
+        "DOTNET_TAG": "6.0-bookworm-slim",
+        "GO_TAG": "1.19-bookworm",
+        "NODE_TAG": "20-bookworm-slim",
+        "PHP_TAG": "8.1-cli-bookworm",
+        "RUBY_TAG": "3.0-bookworm",
+        "RUST_TAG": "1.71-slim-bookworm"
       },
       "tags": [
         "registry.jetbrains.team/p/sa/containers/qodana:dotnet-base"
@@ -87,12 +87,12 @@ With `--print` option in the previous command you'll get the full picture of ima
       "dockerfile": "go.Dockerfile",
       "args": {
         "COMPOSER_TAG": "2.5.1",
-        "DOTNET_TAG": "6.0-bullseye-slim",
-        "GO_TAG": "1.19-bullseye",
-        "NODE_TAG": "20-bullseye-slim",
-        "PHP_TAG": "8.1-cli-bullseye",
-        "RUBY_TAG": "3.0-bullseye",
-        "RUST_TAG": "1.71-slim-bullseye"
+        "DOTNET_TAG": "6.0-bookworm-slim",
+        "GO_TAG": "1.19-bookworm",
+        "NODE_TAG": "20-bookworm-slim",
+        "PHP_TAG": "8.1-cli-bookworm",
+        "RUBY_TAG": "3.0-bookworm",
+        "RUST_TAG": "1.71-slim-bookworm"
       },
       "tags": [
         "registry.jetbrains.team/p/sa/containers/qodana:go-base"
@@ -107,12 +107,12 @@ With `--print` option in the previous command you'll get the full picture of ima
       "dockerfile": "js.Dockerfile",
       "args": {
         "COMPOSER_TAG": "2.5.1",
-        "DOTNET_TAG": "6.0-bullseye-slim",
-        "GO_TAG": "1.19-bullseye",
-        "NODE_TAG": "20-bullseye-slim",
-        "PHP_TAG": "8.1-cli-bullseye",
-        "RUBY_TAG": "3.0-bullseye",
-        "RUST_TAG": "1.71-slim-bullseye"
+        "DOTNET_TAG": "6.0-bookworm-slim",
+        "GO_TAG": "1.19-bookworm",
+        "NODE_TAG": "20-bookworm-slim",
+        "PHP_TAG": "8.1-cli-bookworm",
+        "RUBY_TAG": "3.0-bookworm",
+        "RUST_TAG": "1.71-slim-bookworm"
       },
       "tags": [
         "registry.jetbrains.team/p/sa/containers/qodana:js-base"
@@ -127,12 +127,12 @@ With `--print` option in the previous command you'll get the full picture of ima
       "dockerfile": "php.Dockerfile",
       "args": {
         "COMPOSER_TAG": "2.5.1",
-        "DOTNET_TAG": "6.0-bullseye-slim",
-        "GO_TAG": "1.19-bullseye",
-        "NODE_TAG": "20-bullseye-slim",
-        "PHP_TAG": "8.1-cli-bullseye",
-        "RUBY_TAG": "3.0-bullseye",
-        "RUST_TAG": "1.71-slim-bullseye"
+        "DOTNET_TAG": "6.0-bookworm-slim",
+        "GO_TAG": "1.19-bookworm",
+        "NODE_TAG": "20-bookworm-slim",
+        "PHP_TAG": "8.1-cli-bookworm",
+        "RUBY_TAG": "3.0-bookworm",
+        "RUST_TAG": "1.71-slim-bookworm"
       },
       "tags": [
         "registry.jetbrains.team/p/sa/containers/qodana:php-base"
@@ -163,7 +163,7 @@ With `--print` option in the previous command you'll get the full picture of ima
       },
       "dockerfile": "python.js.Dockerfile",
       "args": {
-        "NODE_TAG": "20-bullseye-slim"
+        "NODE_TAG": "20-bookworm-slim"
       },
       "tags": [
         "registry.jetbrains.team/p/sa/containers/qodana:python-js-base"
@@ -178,12 +178,12 @@ With `--print` option in the previous command you'll get the full picture of ima
       "dockerfile": "ruby.Dockerfile",
       "args": {
         "COMPOSER_TAG": "2.5.1",
-        "DOTNET_TAG": "6.0-bullseye-slim",
-        "GO_TAG": "1.19-bullseye",
-        "NODE_TAG": "20-bullseye-slim",
-        "PHP_TAG": "8.1-cli-bullseye",
-        "RUBY_TAG": "3.0-bullseye",
-        "RUST_TAG": "1.71-slim-bullseye"
+        "DOTNET_TAG": "6.0-bookworm-slim",
+        "GO_TAG": "1.19-bookworm",
+        "NODE_TAG": "20-bookworm-slim",
+        "PHP_TAG": "8.1-cli-bookworm",
+        "RUBY_TAG": "3.0-bookworm",
+        "RUST_TAG": "1.71-slim-bookworm"
       },
       "tags": [
         "registry.jetbrains.team/p/sa/containers/qodana:ruby-base"
@@ -198,12 +198,12 @@ With `--print` option in the previous command you'll get the full picture of ima
       "dockerfile": "rust.Dockerfile",
       "args": {
         "COMPOSER_TAG": "2.5.1",
-        "DOTNET_TAG": "6.0-bullseye-slim",
-        "GO_TAG": "1.19-bullseye",
-        "NODE_TAG": "20-bullseye-slim",
-        "PHP_TAG": "8.1-cli-bullseye",
-        "RUBY_TAG": "3.0-bullseye",
-        "RUST_TAG": "1.71-slim-bullseye"
+        "DOTNET_TAG": "6.0-bookworm-slim",
+        "GO_TAG": "1.19-bookworm",
+        "NODE_TAG": "20-bookworm-slim",
+        "PHP_TAG": "8.1-cli-bookworm",
+        "RUBY_TAG": "3.0-bookworm",
+        "RUST_TAG": "1.71-slim-bookworm"
       },
       "tags": [
         "registry.jetbrains.team/p/sa/containers/qodana:rust-base"
diff --git a/next/base/cdnet.Dockerfile b/next/base/cdnet.Dockerfile
index 3f8ff6d..bd909f5 100644
--- a/next/base/cdnet.Dockerfile
+++ b/next/base/cdnet.Dockerfile
@@ -1,4 +1,4 @@
-ARG DOTNET_BASE_TAG="7.0-bullseye-slim"
+ARG DOTNET_BASE_TAG="7.0-bookworm-slim"
 FROM mcr.microsoft.com/dotnet/sdk:$DOTNET_BASE_TAG
 
 ENV HOME="/root" \
diff --git a/next/base/debian.Dockerfile b/next/base/debian.Dockerfile
index 2772576..c65c208 100644
--- a/next/base/debian.Dockerfile
+++ b/next/base/debian.Dockerfile
@@ -1,5 +1,5 @@
-ARG BASE_TAG="bullseye-slim"
-ARG NODE_TAG="22-bullseye-slim"
+ARG BASE_TAG="bookworm-slim"
+ARG NODE_TAG="22-bookworm-slim"
 FROM node:$NODE_TAG AS node_base
 FROM debian:$BASE_TAG
 
diff --git a/next/base/debian.js.Dockerfile b/next/base/debian.js.Dockerfile
index 45c5678..706773d 100644
--- a/next/base/debian.js.Dockerfile
+++ b/next/base/debian.js.Dockerfile
@@ -1,4 +1,4 @@
-ARG NODE_TAG="22-bullseye-slim"
+ARG NODE_TAG="22-bookworm-slim"
 FROM node:$NODE_TAG AS node_base
 FROM debianbase
 
diff --git a/next/base/docker-bake.hcl b/next/base/docker-bake.hcl
index d6543de..635b882 100644
--- a/next/base/docker-bake.hcl
+++ b/next/base/docker-bake.hcl
@@ -15,7 +15,7 @@ group "clang" {
 }
 
 group "ruby" {
-  targets = ["ruby2x", "ruby3x"]
+  targets = ["ruby3x"]
 }
 
 target "debian" {
@@ -86,24 +86,9 @@ target "cpp" {
   }
 }
 
-target "ruby2x" {
-  matrix = {
-    version = ["6", "7"]
-  }
-  name = "ruby-base-2${version}-latest"
-  tags = [
-    "registry.jetbrains.team/p/sa/containers/qodana:ruby-base-2.${version}-latest"
-  ]
-  platforms = ["linux/amd64", "linux/arm64"]
-  dockerfile = "ruby.Dockerfile"
-  args = {
-    RUBY_TAG = "2.${version}-slim-bullseye"
-  }
-}
-
 target "ruby3x" {
   matrix = {
-    version = ["0", "1", "2", "3"]
+    version = ["1", "2", "3"]
   }
   name = "ruby-base-3${version}-latest"
   tags = [
@@ -112,6 +97,6 @@ target "ruby3x" {
   platforms = ["linux/amd64", "linux/arm64"]
   dockerfile = "ruby.Dockerfile"
   args = {
-    RUBY_TAG = "3.${version}-slim-bullseye"
+    RUBY_TAG = "3.${version}-slim-bookworm"
   }
 }
\ No newline at end of file
diff --git a/next/base/dotnet.Dockerfile b/next/base/dotnet.Dockerfile
index 9a69d98..6a36258 100644
--- a/next/base/dotnet.Dockerfile
+++ b/next/base/dotnet.Dockerfile
@@ -1,5 +1,5 @@
-ARG NODE_TAG="22-bullseye-slim"
-ARG DOTNET_BASE_TAG="7.0-bullseye-slim"
+ARG NODE_TAG="22-bookworm-slim"
+ARG DOTNET_BASE_TAG="7.0-bookworm-slim"
 FROM node:$NODE_TAG AS node_base
 FROM mcr.microsoft.com/dotnet/sdk:$DOTNET_BASE_TAG
 
diff --git a/next/base/go.Dockerfile b/next/base/go.Dockerfile
index 8147bce..cd3a423 100644
--- a/next/base/go.Dockerfile
+++ b/next/base/go.Dockerfile
@@ -1,5 +1,5 @@
-ARG GO_TAG="1.24-bullseye"
-ARG NODE_TAG="22-bullseye-slim"
+ARG GO_TAG="1.24-bookworm"
+ARG NODE_TAG="22-bookworm-slim"
 FROM node:$NODE_TAG AS node_base
 FROM golang:$GO_TAG
 
diff --git a/next/base/js.Dockerfile b/next/base/js.Dockerfile
index ea29b40..4c58052 100644
--- a/next/base/js.Dockerfile
+++ b/next/base/js.Dockerfile
@@ -1,4 +1,4 @@
-ARG NODE_TAG="22-bullseye-slim"
+ARG NODE_TAG="22-bookworm-slim"
 FROM node:$NODE_TAG
 
 # renovate: datasource=npm depName=eslint
diff --git a/next/base/php.Dockerfile b/next/base/php.Dockerfile
index 679a87d..b1112cc 100644
--- a/next/base/php.Dockerfile
+++ b/next/base/php.Dockerfile
@@ -1,5 +1,5 @@
-ARG NODE_TAG="22-bullseye-slim"
-ARG PHP_TAG="8.4-cli-bullseye"
+ARG NODE_TAG="22-bookworm-slim"
+ARG PHP_TAG="8.4-cli-bookworm"
 ARG COMPOSER_TAG="2.8.5"
 FROM node:$NODE_TAG AS node_base
 FROM composer:$COMPOSER_TAG AS composer_base
diff --git a/next/base/python.js.Dockerfile b/next/base/python.js.Dockerfile
index 2f23d61..2ef6b26 100644
--- a/next/base/python.js.Dockerfile
+++ b/next/base/python.js.Dockerfile
@@ -1,4 +1,4 @@
-ARG NODE_TAG="22-bullseye-slim"
+ARG NODE_TAG="22-bookworm-slim"
 FROM node:$NODE_TAG AS node_base
 FROM pythonbase
 
diff --git a/next/base/ruby.Dockerfile b/next/base/ruby.Dockerfile
index 7fe13fa..d8bfd81 100644
--- a/next/base/ruby.Dockerfile
+++ b/next/base/ruby.Dockerfile
@@ -1,5 +1,5 @@
-ARG NODE_TAG="22-bullseye-slim"
-ARG RUBY_TAG="3.4-slim-bullseye"
+ARG NODE_TAG="22-bookworm-slim"
+ARG RUBY_TAG="3.4-slim-bookworm"
 
 FROM node:$NODE_TAG AS node_base
 FROM ruby:$RUBY_TAG
diff --git a/next/base/rust.Dockerfile b/next/base/rust.Dockerfile
index e1ca51d..02faa5d 100644
--- a/next/base/rust.Dockerfile
+++ b/next/base/rust.Dockerfile
@@ -1,4 +1,4 @@
-ARG RUST_TAG="1.85-slim-bullseye"
+ARG RUST_TAG="1.85-slim-bookworm"
 FROM rust:$RUST_TAG
 
 # renovate: datasource=npm depName=eslint