diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 75bfe54c5..46d7f3e96 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -6,6 +6,11 @@ gem "artifactory"
 
 gem "ffi", ">= 1.9.14", "!= 1.13.0"
 
+# Pinning to 2.4.0 as 2.6.0 version breaks the Windows build
+# Ref: https://buildkite.com/chef/inspec-inspec-main-omnibus-release/builds/815#018a1db4-2971-4e77-8bca-32d058fe8c12/173-340
+# We can try reverting this change once it gets fixed in the omnibus-toolchain as per slack conversation
+gem 'ffi-yajl', "= 2.4.0"
+
 # This development group is installed by default when you run `bundle install`,
 # but if you are using Omnibus in a CI-based infrastructure, you do not need
 # the Test Kitchen-based build lab. You can skip these unnecessary dependencies
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index a2bf80c01..ba0ae9d8a 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -201,7 +201,7 @@ GEM
       ffi (~> 1.0)
     ffi-win32-extensions (1.0.4)
       ffi
-    ffi-yajl (2.6.0)
+    ffi-yajl (2.4.0)
       libyajl2 (>= 1.2)
     fuzzyurl (0.9.0)
     gssapi (1.3.1)
@@ -458,7 +458,7 @@ GEM
     vault (0.17.0)
       aws-sigv4
     webrick (1.8.1)
-    win32-api (1.10.1-universal-mingw32)
+    win32-api (1.10.1)
     win32-certstore (0.6.15)
       chef-powershell (>= 1.0.12)
       ffi
@@ -513,6 +513,7 @@ DEPENDENCIES
   artifactory
   berkshelf (>= 7.0)
   ffi (>= 1.9.14, != 1.13.0)
+  ffi-yajl (= 2.4.0)
   kitchen-vagrant (>= 1.3.1)
   omnibus!
   omnibus-software!