diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 1269d70433..6959d44693 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -5,7 +5,7 @@ steps:
     env:
       RUBY_VERSION: "{{ matrix.ruby }}"
       TEST_SUITE: "{{ matrix.suite }}"
-      STACK_VERSION: 8.17.0-SNAPSHOT
+      STACK_VERSION: 8.17.1-SNAPSHOT
       TRANSPORT_VERSION: "{{ matrix.transport }}"
       RUBY_SOURCE: "{{ matrix.ruby_source }}"
       QUIET: false
@@ -62,7 +62,7 @@ steps:
       provider: "gcp"
     env:
       RUBY_VERSION: "3.3"
-      STACK_VERSION: 8.17.0-SNAPSHOT
+      STACK_VERSION: 8.17.1-SNAPSHOT
       ES_YAML_TESTS_BRANCH: 8.17
       TRANSPORT_VERSION: "8.3"
       RUBY_SOURCE: "ruby"
diff --git a/.github/workflows/8.17.yml b/.github/workflows/8.17.yml
index 428562969e..dfa7450457 100644
--- a/.github/workflows/8.17.yml
+++ b/.github/workflows/8.17.yml
@@ -26,7 +26,7 @@ jobs:
         sudo sysctl -w vm.max_map_count=262144
     - uses: elastic/elastic-github-actions/elasticsearch@master
       with:
-        stack-version: 8.17.0-SNAPSHOT
+        stack-version: 8.17.1-SNAPSHOT
         security-enabled: false
     - uses: ruby/setup-ruby@v1
       with:
@@ -40,4 +40,4 @@ jobs:
     - name: elasticsearch
       run: cd elasticsearch && bundle exec rake test:all
     - name: elasticsearch-api
-      run: rake es:download_artifacts[8.17.0-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit
+      run: rake es:download_artifacts[8.17.1-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit
diff --git a/.github/workflows/otel.yml b/.github/workflows/otel.yml
index 95158d19b2..d99a27ead6 100644
--- a/.github/workflows/otel.yml
+++ b/.github/workflows/otel.yml
@@ -28,7 +28,7 @@ jobs:
           sudo sysctl -w vm.max_map_count=262144
       - uses: elastic/elastic-github-actions/elasticsearch@master
         with:
-          stack-version: 8.17.0-SNAPSHOT
+          stack-version: 8.17.1-SNAPSHOT
           security-enabled: false
       - uses: ruby/setup-ruby@v1
         with:
@@ -42,4 +42,4 @@ jobs:
       - name: elasticsearch
         run: cd elasticsearch && bundle exec rake test:all
       - name: elasticsearch-api
-        run: rake es:download_artifacts[8.17.0-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit
+        run: rake es:download_artifacts[8.17.1-SNAPSHOT] && cd elasticsearch-api && bundle exec rake test:spec test:platinum:unit
diff --git a/elasticsearch-api/elasticsearch-api.gemspec b/elasticsearch-api/elasticsearch-api.gemspec
index a458ed60d1..ebc59fcf0d 100644
--- a/elasticsearch-api/elasticsearch-api.gemspec
+++ b/elasticsearch-api/elasticsearch-api.gemspec
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'ansi'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'elasticsearch'
-  s.add_development_dependency 'elasticsearch-test-runner' unless defined?(JRUBY_VERSION) && JRUBY_VERSION <= "9.4"
+  s.add_development_dependency 'elasticsearch-test-runner' unless defined?(JRUBY_VERSION) && JRUBY_VERSION <= '9.4'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'minitest-reporters', '>= 1.6'
   s.add_development_dependency 'mocha'
@@ -59,6 +59,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'yard'
 
   # Gems for testing integrations
+  s.add_development_dependency 'concurrent-ruby', '1.3.4' if defined? JRUBY_VERSION && JRUBY_VERSION < '9.4'
   s.add_development_dependency 'jsonify'
   s.add_development_dependency 'hashie'
   # Temporary support for Ruby 2.6, since it's EOL March 2022:
diff --git a/rake_tasks/automation.rake b/rake_tasks/automation.rake
index 751804e492..43babd85b7 100644
--- a/rake_tasks/automation.rake
+++ b/rake_tasks/automation.rake
@@ -105,8 +105,8 @@ namespace :automation do
       if file == '.buildkite/pipeline.yml'
         require 'yaml'
         yaml = YAML.safe_load(content)
-        branch = version.match(/([0-9]+\.[0-9]+)\.[0-9]+.*/)[1]
-        yaml_tests_branch = yaml['steps'][1]['env']['ES_YAML_TESTS_BRANCH']
+        branch = version.match(/([0-9]+\.[0-9]+)\.[0-9]+.*/)[1].to_s
+        yaml_tests_branch = yaml['steps'][1]['env']['ES_YAML_TESTS_BRANCH'].to_s
         unless ['main', '8.x'].include? yaml_tests_branch
           content.gsub!(yaml_tests_branch, branch)
           puts "[#{yaml_tests_branch}] -> [#{branch}] in #{file.gsub('./', '')}"