diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index a5646daa1d..0a763be2a6 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,17 +1,17 @@
 GIT
   remote: https://github.com/chef/omnibus-software.git
-  revision: e4e5868d0c7cfcc2d66f5cc2e43c6eeb0f495f22
+  revision: ca4f96b89f63093570b902da0dfa5180b514d19c
   branch: main
   specs:
-    omnibus-software (24.4.319)
+    omnibus-software (24.6.323)
       omnibus (>= 9.0.0)
 
 GIT
   remote: https://github.com/chef/omnibus.git
-  revision: 82dae896a066542f1b66dc866186f856f37e518e
+  revision: 41d5c3bcc0c0c191bc1c85681737315c96946f5d
   branch: main
   specs:
-    omnibus (9.0.23)
+    omnibus (9.0.25)
       aws-sdk-s3 (~> 1.116.0)
       chef-cleanroom (~> 1.0)
       chef-utils (>= 15.4)
diff --git a/omnibus/config/software/keydb.rb b/omnibus/config/software/keydb.rb
new file mode 100644
index 0000000000..483e3878b1
--- /dev/null
+++ b/omnibus/config/software/keydb.rb
@@ -0,0 +1,46 @@
+#
+# Copyright:: Chef Software, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name "keydb"
+
+license "BSD-3-Clause"
+license_file "COPYING"
+skip_transitive_dependency_licensing true
+
+dependency "config_guess"
+dependency "openssl"
+dependency "curl"
+
+default_version "6.3.4"
+
+source url: "https://github.com/Snapchat/KeyDB/archive/refs/tags/v#{version}.tar.gz"
+internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz",
+                authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
+relative_path "KeyDB-#{version}"
+
+# version_list: url=https://github.com/Snapchat/KeyDB/archive/refs/tags/ filter=*.tar.gz
+version("6.3.4") { source sha256: "229190b251f921e05aff7b0d2f04b5676c198131e2abbec1e2cfb2e61215e2f3" }
+
+build do
+  env = with_standard_compiler_flags(with_embedded_path)
+  env["CFLAGS"] << " -I#{install_dir}/embedded/include"
+  env["LDFLAGS"] << " -L#{install_dir}/embedded/lib"
+
+  update_config_guess
+
+  command "make" , env: env
+  command "make install", env: env
+end
diff --git a/omnibus/config/software/server-complete.rb b/omnibus/config/software/server-complete.rb
index 86a24bf9bb..74b166fd58 100644
--- a/omnibus/config/software/server-complete.rb
+++ b/omnibus/config/software/server-complete.rb
@@ -33,6 +33,7 @@
 dependency "postgresql13"
 dependency "redis" # dynamic routing controls
 dependency "haproxy"
+dependency "keydb"
 dependency "opensearch" # used by search
 
 # moved earlier because it is external to this repo and pinned, so should change infrequently