diff --git a/.sync.yml b/.sync.yml
index a6414e43..d45e736e 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -36,6 +36,11 @@ Gemfile:
       - gem: 'beaker-task_helper'
         version: '~> 1.9'
         condition: 'ENV["GEM_BOLT"]'
+      # The Faraday requirements in orchestrator_client 0.7.1 causes Bundler to
+      # resolve the dependency in unexpected ways and causes issues in CI
+      - gem: 'orchestrator_client'
+        version: '< 0.7.1'
+        condition: 'ENV["GEM_BOLT"]'
       - gem: async
         version: '~> 1.30' # otherwise async 2.0.0(needs ruby >=3.1.0) is wrongly selected by bundler on jenkins while running with ruby 2.7.1
     ":system_tests":
diff --git a/Gemfile b/Gemfile
index 7de2f252..0697521b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -44,6 +44,7 @@ group :development do
   gem "nokogiri",                                                              require: false
   gem "bolt", '~> 3.0',                                                        require: false if ENV["GEM_BOLT"]
   gem "beaker-task_helper", '~> 1.9',                                          require: false if ENV["GEM_BOLT"]
+  gem "orchestrator_client", '< 0.7.1',                                        require: false if ENV["GEM_BOLT"]
   gem "async", '~> 1.30',                                                      require: false
 end
 group :development, :release_prep do