diff --git a/configs/components/ruby-2.7.8.rb b/configs/components/ruby-2.7.8.rb
index 73936bd9b..9af699e1e 100644
--- a/configs/components/ruby-2.7.8.rb
+++ b/configs/components/ruby-2.7.8.rb
@@ -237,7 +237,11 @@
   elsif platform.is_macos? && platform.architecture == 'arm64' && platform.os_version.to_i >= 13
     rbconfig_changes["CC"] = 'clang'
   elsif platform.is_windows?
-    rbconfig_changes["CC"] = "x86_64-w64-mingw32-gcc"
+    if platform.architecture == "x64"
+      rbconfig_changes["CC"] = "x86_64-w64-mingw32-gcc"
+    else
+      rbconfig_changes["CC"] = "i686-w64-mingw32-gcc"
+    end
   end
 
   pkg.add_source("file://resources/files/ruby_vendor_gems/operating_system.rb")
diff --git a/configs/projects/bolt-runtime.rb b/configs/projects/bolt-runtime.rb
index 3d517147c..8d4fd3fa2 100644
--- a/configs/projects/bolt-runtime.rb
+++ b/configs/projects/bolt-runtime.rb
@@ -118,12 +118,8 @@
   proj.component "puppet-ca-bundle"
   proj.component "ruby-#{proj.ruby_version}"
 
-  # Building native gems on Windows has some issues right now.
-  # Include for non-Windows platforms only.
-  unless platform.is_windows?
-    proj.component 'rubygem-bcrypt_pbkdf'
-    proj.component 'rubygem-ed25519'
-  end
+  proj.component 'rubygem-bcrypt_pbkdf'
+  proj.component 'rubygem-ed25519'
 
   # Puppet dependencies
   proj.component 'rubygem-hocon'