diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 8106685b3e7..925f238e248 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.4
 
-ARG RUBY_VERSION=3.3.5
+ARG RUBY_VERSION=3.3.6
 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 f72039cf3e6..aaaa80e1382 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@52753b7da854d5c07df37391a986c76ab4615999 # v1.191.0
+    - uses: ruby/setup-ruby@217c988b8c2bf2bacb2d5c78a7e7b18f8c34daed # v1.200.0
       with:
         ruby-version: ${{ inputs.ruby-version }}
         bundler-cache: true
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 1cce01e300f..ac1477b781b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-24.04
     env:
       RUBYGEMS_VERSION: "3.5.20"
-      RUBY_VERSION: "3.3.5"
+      RUBY_VERSION: "3.3.6"
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Set up Docker Buildx
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c8c06f289bd..8a3c99e4cc2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -29,7 +29,7 @@ jobs:
             version: "3.5.20"
           - name: latest
             version: latest
-        ruby_version: ["3.3.5"]
+        ruby_version: ["3.3.6"]
         tests:
           - name: general
             command: test
@@ -37,7 +37,7 @@ jobs:
             command: test:system
         include:
           - rubygems: { name: latest, version: latest }
-            ruby_version: "3.3.5"
+            ruby_version: "3.3.6"
             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 fa7adc7ac72..9c25013dbb8 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.3.5
+3.3.6
diff --git a/Dockerfile b/Dockerfile
index 5f90f78e023..8071a5035b0 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.5
+ARG RUBY_VERSION=3.3.6
 ARG ALPINE_VERSION=3.20
 FROM ruby:$RUBY_VERSION-alpine${ALPINE_VERSION} as base
 
diff --git a/Gemfile.lock b/Gemfile.lock
index d09ae22b9f8..7317718a1d2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1328,7 +1328,7 @@ CHECKSUMS
   zlib (3.1.1) sha256=f61bb03139bbe256c36ba99ef9fece1fb223e9034ed9e5fa3ddb1588d99abc71
 
 RUBY VERSION
-   ruby 3.3.5p100
+   ruby 3.3.6p108
 
 BUNDLED WITH
    2.5.21