diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 925f238e248..515f1edf971 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.4
 
-ARG RUBY_VERSION=3.3.6
+ARG RUBY_VERSION=3.4.1
 FROM ghcr.io/rails/devcontainer/images/ruby:$RUBY_VERSION
 
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
diff --git a/.github/actions/setup-rubygems.org/action.yml b/.github/actions/setup-rubygems.org/action.yml
index aaaa80e1382..cabb9895217 100644
--- a/.github/actions/setup-rubygems.org/action.yml
+++ b/.github/actions/setup-rubygems.org/action.yml
@@ -23,7 +23,7 @@ runs:
       if: github.secret_source != 'None' && inputs.install-avo-pro == 'true'
       run: |
         printf "BUNDLE_WITH=avo\nRAILS_GROUPS=avo\n" >> $GITHUB_ENV
-    - uses: ruby/setup-ruby@217c988b8c2bf2bacb2d5c78a7e7b18f8c34daed # v1.200.0
+    - uses: ruby/setup-ruby@4a9ddd6f338a97768b8006bf671dfbad383215f4 # v1.207.0
       with:
         ruby-version: ${{ inputs.ruby-version }}
         bundler-cache: true
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index fd203f735a0..9baf0f7a30e 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -13,8 +13,8 @@ jobs:
     name: Docker build (and optional push)
     runs-on: ubuntu-24.04
     env:
-      RUBYGEMS_VERSION: "3.6.1"
-      RUBY_VERSION: "3.3.6"
+      RUBYGEMS_VERSION: "3.6.2"
+      RUBY_VERSION: "3.4.1"
     permissions:
       id-token: write
     steps:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index f3a3d2d9f0a..39382ea437e 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
+      - uses: ruby/setup-ruby@4a9ddd6f338a97768b8006bf671dfbad383215f4 # v1.207.0
         with:
           bundler-cache: true
       - name: Rubocop
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
+      - uses: ruby/setup-ruby@4a9ddd6f338a97768b8006bf671dfbad383215f4 # v1.207.0
         with:
           bundler-cache: true
       - name: Brakeman
@@ -39,7 +39,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
+      - uses: ruby/setup-ruby@4a9ddd6f338a97768b8006bf671dfbad383215f4 # v1.207.0
         with:
           bundler-cache: true
       - name: Importmap Verify
@@ -59,7 +59,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
+      - uses: ruby/setup-ruby@4a9ddd6f338a97768b8006bf671dfbad383215f4 # v1.207.0
         with:
           bundler-cache: true
       - name: krane render
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7bdae5d988f..754737e4b4a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -26,10 +26,10 @@ jobs:
       matrix:
         rubygems:
           - name: locked
-            version: "3.6.1"
+            version: "3.6.2"
           - name: latest
             version: latest
-        ruby_version: ["3.3.6"]
+        ruby_version: ["3.4.1"]
         tests:
           - name: general
             command: test
@@ -37,7 +37,7 @@ jobs:
             command: test:system
         include:
           - rubygems: { name: latest, version: latest }
-            ruby_version: "3.3.6"
+            ruby_version: "3.4.1"
             tests: { name: "avo without pro", command: "test test/*/avo" }
     name: Rails tests ${{ matrix.tests.name }} (RubyGems ${{ matrix.rubygems.name }}, Ruby ${{ matrix.ruby_version }})
     runs-on: ubuntu-22.04
diff --git a/.ruby-version b/.ruby-version
index 9c25013dbb8..47b322c971c 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.3.6
+3.4.1
diff --git a/Dockerfile b/Dockerfile
index 8071a5035b0..ea5577ad1cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:1.10
 
 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
-ARG RUBY_VERSION=3.3.6
+ARG RUBY_VERSION=3.4.1
 ARG ALPINE_VERSION=3.20
 FROM ruby:$RUBY_VERSION-alpine${ALPINE_VERSION} as base
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 19b56134b9d..43f16cac5dc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1336,7 +1336,7 @@ CHECKSUMS
   zlib (3.1.1) sha256=f61bb03139bbe256c36ba99ef9fece1fb223e9034ed9e5fa3ddb1588d99abc71
 
 RUBY VERSION
-   ruby 3.3.6p108
+   ruby 3.4.1p0
 
 BUNDLED WITH
-   2.6.1
+   2.6.2