diff --git a/.controlplane/Dockerfile b/.controlplane/Dockerfile
index 8a809700f..deb89a37a 100644
--- a/.controlplane/Dockerfile
+++ b/.controlplane/Dockerfile
@@ -1,5 +1,5 @@
 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
-ARG RUBY_VERSION=3.3.4
+ARG RUBY_VERSION=3.4.6
 FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base
 
 # Current commit hash environment variable
@@ -8,7 +8,7 @@ ENV GIT_COMMIT_SHA=${GIT_COMMIT}
 
 # Install packages needed to build gems and node modules
 RUN apt-get update -qq && \
-    apt-get install --no-install-recommends -y build-essential curl git libpq-dev libvips node-gyp pkg-config python-is-python3
+    apt-get install --no-install-recommends -y build-essential curl git libyaml-dev libpq-dev libvips node-gyp pkg-config python-is-python3
 
 # Install JavaScript dependencies
 # Make sure NODE_VERSION matches the node version in .nvmrc and package.json
diff --git a/.github/actions/setup-environment/action.yml b/.github/actions/setup-environment/action.yml
index e9212d6e0..cdd7fb272 100644
--- a/.github/actions/setup-environment/action.yml
+++ b/.github/actions/setup-environment/action.yml
@@ -17,7 +17,7 @@ runs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.3.4'
+        ruby-version: '3.4.6'
 
     - name: Install Control Plane CLI and cpflow gem
       shell: bash
diff --git a/.github/workflows/js_test.yml b/.github/workflows/js_test.yml
index ba48c5371..46b6267cb 100644
--- a/.github/workflows/js_test.yml
+++ b/.github/workflows/js_test.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         node: [22.x]
-        ruby: [3.3.4]
+        ruby: [3.4.6]
 
     env:
       RAILS_ENV: test
diff --git a/.github/workflows/lint_test.yml b/.github/workflows/lint_test.yml
index 777aaa2b0..9623e38e0 100644
--- a/.github/workflows/lint_test.yml
+++ b/.github/workflows/lint_test.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         node: [22.x]
-        ruby: [3.3.4]
+        ruby: [3.4.6]
 
     env:
       RAILS_ENV: test
diff --git a/.github/workflows/rspec_test.yml b/.github/workflows/rspec_test.yml
index 4d5625ec3..d117458a6 100644
--- a/.github/workflows/rspec_test.yml
+++ b/.github/workflows/rspec_test.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         node: [22.x]
-        ruby: [3.3.4]
+        ruby: [3.4.6]
 
     services:
       postgres:
diff --git a/.ruby-version b/.ruby-version
index a0891f563..1cf825302 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.3.4
+3.4.6
diff --git a/Gemfile b/Gemfile
index 3cad0baed..ac5cbf1f6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby "3.3.4"
+ruby "3.4.6"
 
 gem "react_on_rails", "16.1.1"
 gem "shakapacker", "9.0.0.beta.8"
@@ -45,11 +45,6 @@ gem "autoprefixer-rails"
 
 gem "awesome_print"
 
-# Needed until Ruby 3.3.4 is released https://github.com/ruby/ruby/pull/11006
-# Related issue: https://github.com/ruby/net-pop/issues/26
-# TODO: When Ruby 3.3.4 is released, upgrade Ruby and remove this line
-gem "net-pop", github: "ruby/net-pop"
-
 gem "redcarpet"
 
 # jquery as the JavaScript library has been moved under /client and managed by npm.
diff --git a/Gemfile.lock b/Gemfile.lock
index 3bb28892c..bf1ddeade 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,3 @@
-GIT
-  remote: https://github.com/ruby/net-pop.git
-  revision: e8d0afe2773b9eb6a23c39e9e437f6fc0fc7c733
-  specs:
-    net-pop (0.1.2)
-      net-protocol
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -148,8 +141,6 @@ GEM
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
     ffi (1.17.0)
-    ffi (1.17.0-arm64-darwin)
-    ffi (1.17.0-x86_64-linux-gnu)
     foreman (0.88.1)
     generator_spec (0.10.0)
       activesupport (>= 3.0.0)
@@ -195,6 +186,8 @@ GEM
     net-imap (0.5.10)
       date
       net-protocol
+    net-pop (0.1.2)
+      net-protocol
     net-protocol (0.2.2)
       timeout
     net-smtp (0.5.1)
@@ -455,9 +448,11 @@ GEM
     zeitwerk (2.7.3)
 
 PLATFORMS
+  arm64-darwin
   arm64-darwin-22
   ruby
   x86_64-linux
+  x86_64-linux-gnu
 
 DEPENDENCIES
   autoprefixer-rails
@@ -474,7 +469,6 @@ DEPENDENCIES
   jbuilder
   launchy
   listen
-  net-pop!
   pg
   pry
   pry-byebug
@@ -508,7 +502,7 @@ DEPENDENCIES
   web-console
 
 RUBY VERSION
-   ruby 3.3.4p94
+   ruby 3.4.6p54
 
 BUNDLED WITH
    2.4.17
diff --git a/conductor-setup.sh b/conductor-setup.sh
index 78d7adc41..cb1fd7b12 100755
--- a/conductor-setup.sh
+++ b/conductor-setup.sh
@@ -3,7 +3,7 @@ set -e
 
 echo "🚀 Setting up React on Rails workspace..."
 
-# Note: This project requires Ruby 3.3.4. 
+# Note: This project requires Ruby 3.4.6.
 # Please ensure you have the correct Ruby version active before running this script.
 
 # Copy environment files if they exist in the root