diff --git a/configs/components/_base-rubygem.rb b/configs/components/_base-rubygem.rb
index 30494d79..ce25148b 100644
--- a/configs/components/_base-rubygem.rb
+++ b/configs/components/_base-rubygem.rb
@@ -35,15 +35,16 @@
 # If a gem needs more command line options to install set the :gem_install_options
 # in its component file rubygem-<compoment>, before the instance_eval of this file.
 gem_install_options = settings["#{pkg.get_name}_gem_install_options".to_sym]
-remove_older_versions = settings["#{pkg.get_name}_remove_older_versions".to_sym]
 # Set a default gem_uninstall
 gem_uninstall = settings[:gem_uninstall] || "#{settings[:host_gem]} uninstall --all --ignore-dependencies"
 pkg.install do
   steps = []
-  steps << "#{gem_uninstall} #{name}" if remove_older_versions
-  steps << if gem_install_options.nil?
-             "#{settings[:gem_install]} #{name}-#{version}.gem"
-           else
-             "#{settings[:gem_install]} #{name}-#{version}.gem #{gem_install_options}"
-           end
+  # Attempting to uninstall a default gem this way will fail, so ignore failures
+  steps << "#{gem_uninstall} --force --silent #{name} || true"
+  steps << "#{settings[:gem_install]} #{name}-#{version}.gem #{gem_install_options || ''}"
+  # If we are installing a newer version of a default gem, we need to remove the existing
+  # specification file so that we don't get warnings. The corresponding gem directory is
+  # usually empty and only there for compatibility reasons, so we remove that too to avoid confusion.
+  steps << "rm -f #{settings[:gem_home]}/specifications/default/#{name}-*.gemspec"
+  steps << "rm -rf #{settings[:gem_home]}/gems/#{name}-*[!#{version}]"
 end
diff --git a/configs/components/rubygem-CFPropertyList.rb b/configs/components/rubygem-CFPropertyList.rb
index c85eeda8..b59f6474 100644
--- a/configs/components/rubygem-CFPropertyList.rb
+++ b/configs/components/rubygem-CFPropertyList.rb
@@ -11,7 +11,6 @@
   pkg.version '4.0.0'
   pkg.sha256sum '385e7bbd7c27e176b23415275ca936ca0ece1727e5b890b08e36632076b00aff'
   pkg.build_requires 'rubygem-base64'
-  pkg.build_requires 'rubygem-nkf'
   pkg.build_requires 'rubygem-rexml'
   ### End automated maintenance section ###
 
diff --git a/configs/components/rubygem-aws-partitions.rb b/configs/components/rubygem-aws-partitions.rb
index 5af2a2f3..29132049 100644
--- a/configs/components/rubygem-aws-partitions.rb
+++ b/configs/components/rubygem-aws-partitions.rb
@@ -5,8 +5,8 @@
 #####
 component 'rubygem-aws-partitions' do |pkg, _settings, _platform|
   ### Maintained by update_gems automation ###
-  pkg.version '1.1190.0'
-  pkg.sha256sum '3e21ce1c99329a96fb71419a5d92d0cece5b276a9f47bc91d6a1290450fb3669'
+  pkg.version '1.1194.0'
+  pkg.sha256sum 'dcc6c65735f4266b9cb14feee67afd2d345e01e5b87697f91ddc06e7603b0811'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-aws-sdk-core.rb b/configs/components/rubygem-aws-sdk-core.rb
index ea708d36..86d224f4 100644
--- a/configs/components/rubygem-aws-sdk-core.rb
+++ b/configs/components/rubygem-aws-sdk-core.rb
@@ -11,9 +11,7 @@
   pkg.build_requires 'rubygem-aws-partitions'
   pkg.build_requires 'rubygem-aws-sigv4'
   pkg.build_requires 'rubygem-base64'
-  pkg.build_requires 'rubygem-bigdecimal'
   pkg.build_requires 'rubygem-jmespath'
-  pkg.build_requires 'rubygem-logger'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-aws-sdk-ec2.rb b/configs/components/rubygem-aws-sdk-ec2.rb
index 3a817dab..2edad258 100644
--- a/configs/components/rubygem-aws-sdk-ec2.rb
+++ b/configs/components/rubygem-aws-sdk-ec2.rb
@@ -5,8 +5,8 @@
 #####
 component 'rubygem-aws-sdk-ec2' do |pkg, _settings, _platform|
   ### Maintained by update_gems automation ###
-  pkg.version '1.583.0'
-  pkg.sha256sum 'd35d4f58811b7619b27f2919f6b88ad87ef764974dfdf05b506d8bc7a2693e15'
+  pkg.version '1.585.0'
+  pkg.sha256sum '72656489064ef23d676beec39a8f0940bbb20d019605ae0b6c39aa11d38bb963'
   pkg.build_requires 'rubygem-aws-sdk-core'
   pkg.build_requires 'rubygem-aws-sigv4'
   ### End automated maintenance section ###
diff --git a/configs/components/rubygem-benchmark.rb b/configs/components/rubygem-benchmark.rb
deleted file mode 100644
index d1511e98..00000000
--- a/configs/components/rubygem-benchmark.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/benchmark
-#####
-component 'rubygem-benchmark' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.5.0'
-  pkg.sha256sum '465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-bigdecimal.rb b/configs/components/rubygem-bigdecimal.rb
deleted file mode 100644
index 20596397..00000000
--- a/configs/components/rubygem-bigdecimal.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/bigdecimal
-#####
-component 'rubygem-bigdecimal' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '3.3.1'
-  pkg.sha256sum 'eaa01e228be54c4f9f53bf3cc34fe3d5e845c31963e7fcc5bedb05a4e7d52218'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-concurrent-ruby.rb b/configs/components/rubygem-concurrent-ruby.rb
index 93a447da..cc2f71e3 100644
--- a/configs/components/rubygem-concurrent-ruby.rb
+++ b/configs/components/rubygem-concurrent-ruby.rb
@@ -5,8 +5,8 @@
 #####
 component 'rubygem-concurrent-ruby' do |pkg, _settings, _platform|
   ### Maintained by update_gems automation ###
-  pkg.version '1.3.5'
-  pkg.sha256sum '813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6'
+  pkg.version '1.3.6'
+  pkg.sha256sum '6b56837e1e7e5292f9864f34b69c5a2cbc75c0cf5338f1ce9903d10fa762d5ab'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-date.rb b/configs/components/rubygem-date.rb
deleted file mode 100644
index e5f4d2bf..00000000
--- a/configs/components/rubygem-date.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/date
-#####
-component 'rubygem-date' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '3.5.0'
-  pkg.sha256sum '5e74fd6c04b0e65d97ad4f3bb5cb2d8efb37f386cc848f46310b4593ffc46ee5'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-excon.rb b/configs/components/rubygem-excon.rb
index 388ada98..2de8ef85 100644
--- a/configs/components/rubygem-excon.rb
+++ b/configs/components/rubygem-excon.rb
@@ -6,7 +6,6 @@
   ### Maintained by update_gems automation ###
   pkg.version '1.3.2'
   pkg.sha256sum 'a089babe98638e58042a7d542b2bbd183304527e33d612b6dde22fa491a544a5'
-  pkg.build_requires 'rubygem-logger'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-faraday.rb b/configs/components/rubygem-faraday.rb
index 5f62580c..236fc499 100644
--- a/configs/components/rubygem-faraday.rb
+++ b/configs/components/rubygem-faraday.rb
@@ -8,8 +8,6 @@
   pkg.version '2.14.0'
   pkg.sha256sum '8699cfe5d97e55268f2596f9a9d5a43736808a943714e3d9a53e6110593941cd'
   pkg.build_requires 'rubygem-faraday-net_http'
-  pkg.build_requires 'rubygem-json'
-  pkg.build_requires 'rubygem-logger'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-fast_gettext.rb b/configs/components/rubygem-fast_gettext.rb
index ae28f872..cfcfd976 100644
--- a/configs/components/rubygem-fast_gettext.rb
+++ b/configs/components/rubygem-fast_gettext.rb
@@ -10,7 +10,6 @@
   # PINNED
   pkg.version '2.4.0'
   pkg.sha256sum 'fd26c4c406aa10be34f0fd2847ce3ffdc1e9d9798de87538594757bbb9175fbf'
-  pkg.build_requires 'rubygem-prime'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-fiddle.rb b/configs/components/rubygem-fiddle.rb
deleted file mode 100644
index bbaf4fd4..00000000
--- a/configs/components/rubygem-fiddle.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/fiddle
-#   https://github.com/ruby/fiddle/releases
-#####
-component 'rubygem-fiddle' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '1.1.8'
-  pkg.sha256sum '7fa8ee3627271497f3add5503acdbc3f40b32f610fc1cf49634f083ef3f32eee'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-forwardable.rb b/configs/components/rubygem-forwardable.rb
deleted file mode 100644
index 9d9a2aee..00000000
--- a/configs/components/rubygem-forwardable.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/forwardable
-#####
-component 'rubygem-forwardable' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '1.3.3'
-  pkg.sha256sum 'f17df4bd6afa6f46a003217023fe5716ef88ce261f5c4cf0edbdeed6470cafac'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-getoptlong.rb b/configs/components/rubygem-getoptlong.rb
deleted file mode 100644
index 563e2cf9..00000000
--- a/configs/components/rubygem-getoptlong.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/getoptlong
-#####
-component 'rubygem-getoptlong' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.2.1'
-  pkg.sha256sum 'fd23f07397b994bf9310d4531cfdb4332629a9b8e8c9c457c32b7edf5bf21ba5'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-gettext.rb b/configs/components/rubygem-gettext.rb
index e252900d..57f30ad4 100644
--- a/configs/components/rubygem-gettext.rb
+++ b/configs/components/rubygem-gettext.rb
@@ -9,8 +9,6 @@
   pkg.sha256sum '03ec7f71ea7e2cf1fdcd5e08682e98b81601922fdbee890b7bc6f63b0e1a512a'
   pkg.build_requires 'rubygem-erubi'
   pkg.build_requires 'rubygem-locale'
-  pkg.build_requires 'rubygem-prime'
-  pkg.build_requires 'rubygem-racc'
   pkg.build_requires 'rubygem-text'
   ### End automated maintenance section ###
 
diff --git a/configs/components/rubygem-highline.rb b/configs/components/rubygem-highline.rb
index 8a69bc01..9056b179 100644
--- a/configs/components/rubygem-highline.rb
+++ b/configs/components/rubygem-highline.rb
@@ -7,7 +7,6 @@
   ### Maintained by update_gems automation ###
   pkg.version '3.1.2'
   pkg.sha256sum '67cbd34d19f6ef11a7ee1d82ffab5d36dfd5b3be861f450fc1716c7125f4bb4a'
-  pkg.build_requires 'rubygem-reline'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-httpclient.rb b/configs/components/rubygem-httpclient.rb
index ae231413..7f7cc519 100644
--- a/configs/components/rubygem-httpclient.rb
+++ b/configs/components/rubygem-httpclient.rb
@@ -7,7 +7,6 @@
   ### Maintained by update_gems automation ###
   pkg.version '2.9.0'
   pkg.sha256sum '4b645958e494b2f86c2f8a2f304c959baa273a310e77a2931ddb986d83e498c8'
-  pkg.build_requires 'rubygem-mutex_m'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-io-console.rb b/configs/components/rubygem-io-console.rb
deleted file mode 100644
index 92a8fec1..00000000
--- a/configs/components/rubygem-io-console.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/io-console
-#####
-component 'rubygem-io-console' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.8.1'
-  pkg.sha256sum '1e15440a6b2f67b6ea496df7c474ed62c860ad11237f29b3bd187f054b925fcb'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-json.rb b/configs/components/rubygem-json.rb
deleted file mode 100644
index 17510fe7..00000000
--- a/configs/components/rubygem-json.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/json
-#####
-component 'rubygem-json' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '2.17.1'
-  pkg.sha256sum 'e0e4824541336a44915436f53e7ea74c687314fb8f88080fa1456f6a34ead92e'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-logger.rb b/configs/components/rubygem-logger.rb
deleted file mode 100644
index 07eed31c..00000000
--- a/configs/components/rubygem-logger.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/logger
-#   https://github.com/ruby/logger/releases
-#####
-component 'rubygem-logger' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '1.7.0'
-  pkg.sha256sum '196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-mutex_m.rb b/configs/components/rubygem-mutex_m.rb
deleted file mode 100644
index fef555b8..00000000
--- a/configs/components/rubygem-mutex_m.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/mutex_m
-#####
-component 'rubygem-mutex_m' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.3.0'
-  pkg.sha256sum 'cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-net-ftp.rb b/configs/components/rubygem-net-ftp.rb
deleted file mode 100644
index fbc15bee..00000000
--- a/configs/components/rubygem-net-ftp.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/net-ftp
-#   https://github.com/ruby/net-ftp/releases
-#####
-component 'rubygem-net-ftp' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.3.9'
-  pkg.sha256sum '307817ccf7f428f79d083f7e36dbb46a9d1d375e0d23027824de1866f0b13b65'
-  pkg.build_requires 'rubygem-net-protocol'
-  pkg.build_requires 'rubygem-time'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-net-protocol.rb b/configs/components/rubygem-net-protocol.rb
deleted file mode 100644
index f9617f65..00000000
--- a/configs/components/rubygem-net-protocol.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/net-protocol
-#####
-component 'rubygem-net-protocol' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.2.2'
-  pkg.sha256sum 'aa73e0cba6a125369de9837b8d8ef82a61849360eba0521900e2c3713aa162a8'
-  pkg.build_requires 'rubygem-timeout'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-nkf.rb b/configs/components/rubygem-nkf.rb
deleted file mode 100644
index 7ae002b5..00000000
--- a/configs/components/rubygem-nkf.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/nkf
-#####
-component 'rubygem-nkf' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.2.0'
-  pkg.sha256sum 'fbc151bda025451f627fafdfcb3f4f13d0b22ae11f58c6d3a2939c76c5f5f126'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-nori.rb b/configs/components/rubygem-nori.rb
index bb0fd3f6..2044eefa 100644
--- a/configs/components/rubygem-nori.rb
+++ b/configs/components/rubygem-nori.rb
@@ -8,7 +8,6 @@
   ### Maintained by update_gems automation ###
   pkg.version '2.7.1'
   pkg.sha256sum '6166cd336959854762073e2fbae888593809cac1b3e904f4fb009313d7226861'
-  pkg.build_requires 'rubygem-bigdecimal'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-openfact.rb b/configs/components/rubygem-openfact.rb
index 6ab9ee81..782d3873 100644
--- a/configs/components/rubygem-openfact.rb
+++ b/configs/components/rubygem-openfact.rb
@@ -5,11 +5,10 @@
 #####
 component 'rubygem-openfact' do |pkg, _settings, _platform|
   ### Maintained by update_gems automation ###
-  pkg.version '5.2.0'
-  pkg.sha256sum 'b044fdbd45b4bb59aab7bf2d2f98065e6a65ecc3cf4cdd91ee32c79c0556d172'
+  pkg.version '5.2.1'
+  pkg.sha256sum '766543bc3ccb1ba5646aaef38e88ced5438c13bb0d72e09d2dd6f9a07fabda0b'
   pkg.build_requires 'rubygem-base64'
   pkg.build_requires 'rubygem-hocon'
-  pkg.build_requires 'rubygem-logger'
   pkg.build_requires 'rubygem-thor'
   ### End automated maintenance section ###
 
diff --git a/configs/components/rubygem-openvox.rb b/configs/components/rubygem-openvox.rb
index b27ac46f..5192a30c 100644
--- a/configs/components/rubygem-openvox.rb
+++ b/configs/components/rubygem-openvox.rb
@@ -7,20 +7,16 @@
 #####
 component 'rubygem-openvox' do |pkg, _settings, _platform|
   ### Maintained by update_gems automation ###
-  pkg.version '8.24.1'
-  pkg.sha256sum '420366b951972e390435353371d527aadd7c80f082fd5ad7b80cd50626a3d439'
+  pkg.version '8.24.2'
+  pkg.sha256sum '61ee735793703383c2af229d4b61eb9250788b30ec3ee86bac31ae006e908ea5'
   pkg.build_requires 'rubygem-base64'
-  pkg.build_requires 'rubygem-benchmark'
   pkg.build_requires 'rubygem-concurrent-ruby'
   pkg.build_requires 'rubygem-deep_merge'
   pkg.build_requires 'rubygem-fast_gettext'
-  pkg.build_requires 'rubygem-getoptlong'
   pkg.build_requires 'rubygem-locale'
   pkg.build_requires 'rubygem-multi_json'
   pkg.build_requires 'rubygem-openfact'
-  pkg.build_requires 'rubygem-ostruct'
   pkg.build_requires 'rubygem-puppet-resource_api'
-  pkg.build_requires 'rubygem-racc'
   pkg.build_requires 'rubygem-scanf'
   pkg.build_requires 'rubygem-semantic_puppet'
   ### End automated maintenance section ###
diff --git a/configs/components/rubygem-ostruct.rb b/configs/components/rubygem-ostruct.rb
deleted file mode 100644
index 7f9cefad..00000000
--- a/configs/components/rubygem-ostruct.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/ostruct
-#####
-component 'rubygem-ostruct' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.6.3'
-  pkg.sha256sum '95a2ed4a4bd1d190784e666b47b2d3f078e4a9efda2fccf18f84ddc6538ed912'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-prime.rb b/configs/components/rubygem-prime.rb
deleted file mode 100644
index 2e023923..00000000
--- a/configs/components/rubygem-prime.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/prime
-#   https://github.com/ruby/prime/releases
-#####
-component 'rubygem-prime' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.1.4'
-  pkg.sha256sum '4d755ebf7c2994a6f3a3fee0d072063be3fff2d4042ebff6cd5eebd4747a225e'
-  pkg.build_requires 'rubygem-forwardable'
-  pkg.build_requires 'rubygem-singleton'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-puppet_forge.rb b/configs/components/rubygem-puppet_forge.rb
index 9d1ca4a1..5c4ce50d 100644
--- a/configs/components/rubygem-puppet_forge.rb
+++ b/configs/components/rubygem-puppet_forge.rb
@@ -6,8 +6,9 @@
 #####
 component 'rubygem-puppet_forge' do |pkg, _settings, _platform|
   ### Maintained by update_gems automation ###
-  pkg.version '6.0.0'
-  pkg.sha256sum '0770bed61c9f5b21bd81666b121e086165e34c45691bdefec70438bf412f8ddf'
+  pkg.version '6.1.0'
+  pkg.sha256sum 'e3bfe83282f0136adf0938f52180a53b45434b70464a5a453d6398df6563764b'
+  pkg.build_requires 'rubygem-base64'
   pkg.build_requires 'rubygem-faraday'
   pkg.build_requires 'rubygem-faraday-follow_redirects'
   pkg.build_requires 'rubygem-minitar'
diff --git a/configs/components/rubygem-racc.rb b/configs/components/rubygem-racc.rb
deleted file mode 100644
index 3dfb340f..00000000
--- a/configs/components/rubygem-racc.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/racc
-#####
-component 'rubygem-racc' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '1.8.1'
-  pkg.sha256sum '4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-reline.rb b/configs/components/rubygem-reline.rb
deleted file mode 100644
index 92ca4111..00000000
--- a/configs/components/rubygem-reline.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/reline
-#####
-component 'rubygem-reline' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.6.3'
-  pkg.sha256sum '1198b04973565b36ec0f11542ab3f5cfeeec34823f4e54cebde90968092b1835'
-  pkg.build_requires 'rubygem-io-console'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-ruby-dbus.rb b/configs/components/rubygem-ruby-dbus.rb
index 1797b385..33c612fe 100644
--- a/configs/components/rubygem-ruby-dbus.rb
+++ b/configs/components/rubygem-ruby-dbus.rb
@@ -6,7 +6,6 @@
   ### Maintained by update_gems automation ###
   pkg.version '0.25.0'
   pkg.sha256sum 'fe431ca96a61f7c87a5177a43c9fe0a50eafe174c1d108421e38bb5165ea4814'
-  pkg.build_requires 'rubygem-logger'
   pkg.build_requires 'rubygem-rexml'
   ### End automated maintenance section ###
 
diff --git a/configs/components/rubygem-ruby2_keywords.rb b/configs/components/rubygem-ruby2_keywords.rb
deleted file mode 100644
index da494d60..00000000
--- a/configs/components/rubygem-ruby2_keywords.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/ruby2_keywords
-#   https://github.com/ruby/ruby2_keywords/releases
-#####
-component 'rubygem-ruby2_keywords' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.0.5'
-  pkg.sha256sum 'ffd13740c573b7301cf7a2e61fc857b2a8e3d3aff32545d6f8300d8bae10e3ef'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-singleton.rb b/configs/components/rubygem-singleton.rb
deleted file mode 100644
index 47dc8728..00000000
--- a/configs/components/rubygem-singleton.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/singleton
-#####
-component 'rubygem-singleton' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.3.0'
-  pkg.sha256sum '83ea1bca5f4aa34d00305ab842a7862ea5a8a11c73d362cb52379d94e9615778'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-time.rb b/configs/components/rubygem-time.rb
deleted file mode 100644
index bb2fd13c..00000000
--- a/configs/components/rubygem-time.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/time
-#####
-component 'rubygem-time' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.4.1'
-  pkg.sha256sum '035f360508a4a4dbabcbbcd3886566b9abd432de89136795d2ff7aec5bcdea61'
-  pkg.build_requires 'rubygem-date'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-timeout.rb b/configs/components/rubygem-timeout.rb
deleted file mode 100644
index 71ddb67f..00000000
--- a/configs/components/rubygem-timeout.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/timeout
-#####
-component 'rubygem-timeout' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '0.5.0'
-  pkg.sha256sum '852aefd13f41d84c2d0d83099b275034c6517395884b58e635acc8847c9190cb'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/components/rubygem-uri.rb b/configs/components/rubygem-uri.rb
index e40f71a8..9ef87230 100644
--- a/configs/components/rubygem-uri.rb
+++ b/configs/components/rubygem-uri.rb
@@ -1,11 +1,15 @@
 #####
 # Component release information:
 #   https://rubygems.org/gems/uri
+# Notes:
+#   2025-12-14: This is a default gem, and is only included here to address
+#   CVE-2025-61594. This component should be removed once Ruby 3.2.10 is released.
 #####
 component 'rubygem-uri' do |pkg, _settings, _platform|
   ### Maintained by update_gems automation ###
-  pkg.version '1.1.1'
-  pkg.sha256sum '379fa58d27ffb1387eaada68c749d1426738bd0f654d812fcc07e7568f5c57c6'
+  # PINNED
+  pkg.version '0.12.5'
+  pkg.sha256sum '883424e272244f029ad3b9fe0e9ad18d1c33cdadff0a366c301ce737c62eb414'
   ### End automated maintenance section ###
 
   instance_eval File.read('configs/components/_base-rubygem.rb')
diff --git a/configs/components/rubygem-win32ole.rb b/configs/components/rubygem-win32ole.rb
deleted file mode 100644
index a7be897d..00000000
--- a/configs/components/rubygem-win32ole.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#####
-# Component release information:
-#   https://rubygems.org/gems/win32ole
-#   https://github.com/ruby/win32ole/releases
-#####
-component 'rubygem-win32ole' do |pkg, _settings, _platform|
-  ### Maintained by update_gems automation ###
-  pkg.version '1.9.2'
-  pkg.sha256sum '99612fe2c6cb397c0910680f7d1ba6366f08e37aeac83ebaeab9e72ee823e0f5'
-  ### End automated maintenance section ###
-
-  instance_eval File.read('configs/components/_base-rubygem.rb')
-end
diff --git a/configs/projects/agent-runtime-main.rb b/configs/projects/agent-runtime-main.rb
index 8dc3778e..cc69ed49 100644
--- a/configs/projects/agent-runtime-main.rb
+++ b/configs/projects/agent-runtime-main.rb
@@ -44,38 +44,27 @@
   proj.component 'puppet-ca-bundle'
   proj.component "ruby-#{proj.ruby_version}"
 
-  proj.component 'rubygem-base64'
   proj.component 'rubygem-concurrent-ruby'
   proj.component 'rubygem-deep_merge'
   proj.component 'rubygem-erubi'
   proj.component 'rubygem-fast_gettext'
   proj.component 'rubygem-ffi'
-  proj.component 'rubygem-fiddle'
   proj.component 'rubygem-gettext'
-  proj.component 'rubygem-racc'
   proj.component 'rubygem-hiera-eyaml'
   proj.component 'rubygem-highline'
-  proj.component 'rubygem-reline'
-  proj.component 'rubygem-io-console'
   proj.component 'rubygem-hocon'
   proj.component 'rubygem-locale'
-  proj.component 'rubygem-logger'
   proj.component 'rubygem-multi_json'
-  proj.component 'rubygem-net-ftp'
-  proj.component 'rubygem-time'
-  proj.component 'rubygem-date'
-  proj.component 'rubygem-net-protocol'
-  proj.component 'rubygem-timeout'
   proj.component 'rubygem-net-ssh'
   proj.component 'rubygem-optimist'
-  proj.component 'rubygem-prime'
-  proj.component 'rubygem-singleton'
-  proj.component 'rubygem-forwardable'
   proj.component 'rubygem-semantic_puppet'
   proj.component 'rubygem-scanf'
   proj.component 'rubygem-text'
   proj.component 'rubygem-thor'
 
+  # Remove this once Ruby 3.2.10 is released
+  proj.component 'rubygem-uri'
+
   # We add rexml explicitly in here because even though ruby 3 ships with rexml as its default gem, the version
   # of rexml it ships with can contain CVEs. So, we add it here to update to a higher version free from the CVEs.
   proj.component 'rubygem-rexml'
@@ -87,14 +76,10 @@
     proj.component 'rubygem-sys-filesystem'
   end
 
-  if platform.is_windows?
-    proj.component 'rubygem-win32ole'
-  end
-
   if platform.is_macos?
     proj.component 'readline'
     proj.component 'rubygem-CFPropertyList'
-    proj.component 'rubygem-nkf'
+    proj.component 'rubygem-base64'
   end
 
   unless platform.is_aix? || platform.is_windows?
diff --git a/configs/projects/openbolt-runtime.rb b/configs/projects/openbolt-runtime.rb
index b68ff9c6..da7b3659 100644
--- a/configs/projects/openbolt-runtime.rb
+++ b/configs/projects/openbolt-runtime.rb
@@ -125,22 +125,12 @@
   proj.component 'rubygem-bcrypt_pbkdf'
   proj.component 'rubygem-ed25519'
 
-  # These gems are still included in Ruby 3.2, but we include them because
-  # OpenFact requires them for Ruby 3.4 support, and Bolt will need to
-  # do the same once we get to Ruby 3.4+ support.
-  proj.component 'rubygem-logger'
-  proj.component 'rubygem-base64'
-
   # Puppet dependencies
   proj.component 'rubygem-hocon'
   proj.component 'rubygem-deep_merge'
   proj.component 'rubygem-text'
   proj.component 'rubygem-locale'
   proj.component 'rubygem-gettext'
-  proj.component 'rubygem-racc'
-  proj.component 'rubygem-prime'
-  proj.component 'rubygem-singleton'
-  proj.component 'rubygem-forwardable'
   proj.component 'rubygem-fast_gettext'
   proj.component 'rubygem-scanf'
   proj.component 'rubygem-semantic_puppet'
@@ -150,14 +140,11 @@
 
   # hiera-eyaml and its dependencies
   proj.component 'rubygem-highline'
-  proj.component 'rubygem-reline'
-  proj.component 'rubygem-io-console'
   proj.component 'rubygem-optimist'
   proj.component 'rubygem-hiera-eyaml'
 
   # faraday and its dependencies
   proj.component 'rubygem-faraday'
-  proj.component 'rubygem-json'
   proj.component 'rubygem-faraday-em_http'
   proj.component 'rubygem-em-http-request'
   proj.component 'rubygem-http_parser.rb'
@@ -171,28 +158,25 @@
   proj.component 'rubygem-faraday-multipart'
   proj.component 'rubygem-faraday-net_http'
   proj.component 'rubygem-net-http'
-  proj.component 'rubygem-uri'
   proj.component 'rubygem-faraday-net_http_persistent'
   proj.component 'rubygem-faraday-patron'
   proj.component 'rubygem-patron'
   proj.component 'rubygem-faraday-rack'
   proj.component 'rubygem-faraday-retry'
   proj.component 'rubygem-faraday-follow_redirects'
-  proj.component 'rubygem-ruby2_keywords'
 
   # Core dependencies
   proj.component 'rubygem-addressable'
   proj.component 'rubygem-aws-eventstream'
   proj.component 'rubygem-aws-partitions'
   proj.component 'rubygem-aws-sdk-core'
-  proj.component 'rubygem-bigdecimal'
   proj.component 'rubygem-aws-sdk-ec2'
   proj.component 'rubygem-aws-sigv4'
   proj.component 'rubygem-bindata'
   proj.component 'rubygem-builder'
   proj.component 'rubygem-CFPropertyList'
+  proj.component 'rubygem-base64'
   proj.component 'rubygem-rexml'
-  proj.component 'rubygem-nkf'
   proj.component 'rubygem-colored2'
   proj.component 'rubygem-concurrent-ruby'
   proj.component 'rubygem-connection_pool'
@@ -200,12 +184,10 @@
   proj.component 'rubygem-erubi'
   proj.component 'rubygem-openfact'
   proj.component 'rubygem-ffi'
-  proj.component 'rubygem-fiddle'
   proj.component 'rubygem-gssapi'
   proj.component 'rubygem-gyoku'
   proj.component 'rubygem-hiera'
   proj.component 'rubygem-httpclient'
-  proj.component 'rubygem-mutex_m'
   proj.component 'rubygem-jmespath'
   proj.component 'rubygem-jwt'
   proj.component 'rubygem-little-plugger'
@@ -216,11 +198,6 @@
   proj.component 'rubygem-multi_json'
   proj.component 'rubygem-multipart-post'
   proj.component 'rubygem-net-http-persistent'
-  proj.component 'rubygem-net-ftp'
-  proj.component 'rubygem-time'
-  proj.component 'rubygem-date'
-  proj.component 'rubygem-net-protocol'
-  proj.component 'rubygem-timeout'
   proj.component 'rubygem-net-scp'
   proj.component 'rubygem-net-ssh'
   proj.component 'rubygem-net-ssh-krb'
@@ -229,9 +206,6 @@
   proj.component 'rubygem-paint'
   proj.component 'rubygem-public_suffix'
   proj.component 'rubygem-openvox'
-  proj.component 'rubygem-ostruct'
-  proj.component 'rubygem-benchmark'
-  proj.component 'rubygem-getoptlong'
   proj.component 'rubygem-openfact'
   proj.component 'rubygem-puppet_forge'
   proj.component 'rubygem-puppet-resource_api'
@@ -250,6 +224,9 @@
   proj.component 'rubygem-webrick'
   proj.component 'rubygem-yard'
 
+  # Remove this once Ruby 3.2.10 is released
+  proj.component 'rubygem-uri'
+
   # Core Windows dependencies
   proj.component 'rubygem-windows_error'
   proj.component 'rubygem-winrm'
@@ -261,10 +238,6 @@
     proj.component 'ruby-selinux'
   end
 
-  if platform.is_windows?
-    proj.component 'rubygem-win32ole'
-  end
-
   # Non-windows specific components
   unless platform.is_windows?
     # C Augeas + deps
diff --git a/tasks/update_gems.rake b/tasks/update_gems.rake
index ec08adc7..7c9824ae 100644
--- a/tasks/update_gems.rake
+++ b/tasks/update_gems.rake
@@ -23,6 +23,98 @@ GEM_TYPE       = /^\s*#\s*GEM\s+TYPE:\s*(?<platform>[A-Za-z0-9\-_.]+)\s*$/
 PROJ_COMPONENT = /^\s*proj\.component\s+(?<quote>['"]?)(?<component>rubygem-[^'"\s]+)\k<quote>\s*$/
 
 TARGET_RUBY_VER = ENV['TARGET_RUBY']&.strip || '3.2'
+# Update this list when targeting a new Ruby version. Comment out
+# gems that we specifically want to manage even if they are default or bundled.
+DEFAULT_AND_BUNDLED_GEMS = [
+  'abbrev',
+  # 'base64',
+  'benchmark',
+  'bigdecimal',
+  'bundler',
+  'cgi',
+  'csv',
+  'date',
+  'debug',
+  'delegate',
+  'did_you_mean',
+  'digest',
+  'drb',
+  'english',
+  'erb',
+  'error_highlight',
+  'etc',
+  'fcntl',
+  'fiddle',
+  'fileutils',
+  'find',
+  'forwardable',
+  'getoptlong',
+  'io-console',
+  'io-nonblock',
+  'io-wait',
+  'ipaddr',
+  'irb',
+  'json',
+  'logger',
+  'matrix',
+  'minitest',
+  'mutex_m',
+  'net-ftp',
+  # 'net-http',
+  'net-imap',
+  'net-pop',
+  'net-protocol',
+  'net-smtp',
+  'nkf',
+  'observer',
+  'open-uri',
+  'open3',
+  'openssl',
+  'optparse',
+  'ostruct',
+  'pathname',
+  'power_assert',
+  'pp',
+  'prettyprint',
+  'prime',
+  'pstore',
+  'psych',
+  'racc',
+  'rake',
+  'rbs',
+  'rdoc',
+  # 'rexml',
+  'readline',
+  'readline-ext',
+  'reline',
+  'resolv',
+  'resolv-replace',
+  'rinda',
+  'rss',
+  'ruby2_keywords',
+  'rubygems',
+  'securerandom',
+  'set',
+  'shellwords',
+  'singleton',
+  'stringio',
+  'strscan',
+  'syntax_suggest',
+  'syslog',
+  'tempfile',
+  'test-unit',
+  'time',
+  'timeout',
+  'tmpdir',
+  'tsort',
+  'typeprof',
+  'un',
+  # 'uri',
+  'weakref',
+  'win32ole',
+  'yaml',
+  'zlib'
+].freeze
 @versions_cache = {}
 
 @component_deps    = {} # gem_name => [dep gem names]
@@ -100,6 +192,8 @@ def get_metadata(name:, version: nil, platforms: ['ruby'])
 
   shas = platforms.to_h { |platform| [platform, find_sha(name, version, platform)] }
   deps = get_version_details(name, version).dig('dependencies', 'runtime') || []
+  # Remove any default gems as we don't want to manage them unless specifically needed
+  deps.reject! { |d| DEFAULT_AND_BUNDLED_GEMS.include?(d['name']) }
   { 'version' => version, 'shas' => shas, 'dependencies' => deps }
 end