diff --git a/.ruby-version b/.ruby-version
index fa7adc7ac..9c25013db 100755
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.3.5
+3.3.6
diff --git a/Gemfile b/Gemfile
index e03f34389..de4a70b00 100755
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,5 @@
 source "https://rubygems.org"
-ruby "~> 3.3.5"
+ruby "~> 3.3.6"
 
 gem "rails", "~> 6"
 gem "active_model_serializers"
diff --git a/Gemfile.lock b/Gemfile.lock
index 88bf69b4f..7c4c4b97b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -431,7 +431,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 3.3.5p100
+   ruby 3.3.6p108
 
 BUNDLED WITH
    2.5.23
diff --git a/docker_configs/api.Dockerfile b/docker_configs/api.Dockerfile
index 6a517dfc6..6399440e3 100644
--- a/docker_configs/api.Dockerfile
+++ b/docker_configs/api.Dockerfile
@@ -1,10 +1,10 @@
-FROM ruby:3.3.5
+FROM ruby:3.3.6
 RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg > /dev/null && \
   sh -c '. /etc/os-release; echo $VERSION_CODENAME; echo "deb http://apt.postgresql.org/pub/repos/apt/ $VERSION_CODENAME-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' && \
   apt-get update -qq && apt-get install -y build-essential libpq-dev postgresql postgresql-contrib && \
   mkdir -p /etc/apt/keyrings && \
   curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
-  sh -c 'echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" >> /etc/apt/sources.list.d/nodesource.list' && \
+  sh -c 'echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" >> /etc/apt/sources.list.d/nodesource.list' && \
   apt-get update -qq && \
   sh -c 'echo "\nPackage: *\nPin: origin deb.nodesource.com\nPin-Priority: 700\n" >> /etc/apt/preferences' && \
   apt-get install -y nodejs && \
diff --git a/package.json b/package.json
index 4548478c1..f42b9c1e7 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "Farmbot web frontend.",
   "engines": {
     "browsers": "defaults",
-    "node": "20.x",
+    "node": "22.x",
     "npm": "10.x",
     "parcel": "2.x"
   },
@@ -31,6 +31,7 @@
   "license": "MIT",
   "overrides": {
     "cheerio": "1.0.0-rc.12",
+    "get-intrinsic": "1.2.4",
     "@parcel/watcher": "2.1.0"
   },
   "dependencies": {