diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 23497b73cf967..0badffbcdcc90 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -89,6 +89,7 @@ jobs:
           # check-version needs tags
           fetch-depth: 0 # fetch everything
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
+      - uses: ruby/setup-ruby@v1
       - run: bash scripts/environment/prepare.sh
       - uses: actions/cache@v3
         name: Cache Cargo registry + index
@@ -129,11 +130,7 @@ jobs:
         run: make check-markdown
       - name: Check Component Docs
         if: needs.changes.outputs.source == 'true' || needs.changes.outputs.component_docs == 'true'
-        uses: nick-fields/retry@v2
-        with:
-          max_attempts: 10
-          timeout_seconds: 900
-          command: make check-component-docs
+        run: make check-component-docs
       - name: Check Rust Docs
         if: needs.changes.outputs.source == 'true'
         run: cd rust-doc && make docs
diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 0000000000000..0aec50e6ede78
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+3.1.4
diff --git a/scripts/Gemfile b/scripts/Gemfile
index 3547dd6311eca..8fb1de071f728 100644
--- a/scripts/Gemfile
+++ b/scripts/Gemfile
@@ -1,4 +1,4 @@
-ruby '~> 2.7.0'
+ruby '~> 3.1.0'
 
 # !!!
 # Please try not to add more dependencies here.
diff --git a/scripts/Gemfile.lock b/scripts/Gemfile.lock
index bac6a4ecd3493..051a61c1e83da 100644
--- a/scripts/Gemfile.lock
+++ b/scripts/Gemfile.lock
@@ -30,7 +30,7 @@ DEPENDENCIES
   toml-rb (~> 2.0)
 
 RUBY VERSION
-   ruby 2.7.1p83
+   ruby 3.1.4p223
 
 BUNDLED WITH
-   2.1.4
+   2.4.14
diff --git a/scripts/environment/prepare.sh b/scripts/environment/prepare.sh
index d00924206114c..73d51c951b1b4 100755
--- a/scripts/environment/prepare.sh
+++ b/scripts/environment/prepare.sh
@@ -21,10 +21,6 @@ if ! rust-license-tool --help >& /dev/null ; then
   cargo install --git https://github.com/DataDog/rust-license-tool
 fi
 
-cd scripts
-bundle install
-cd ..
-
 # Currently fixing this to version 0.30 since version 0.31 has introduced
 # a change that means it only works with versions of node > 10.
 # https://github.com/igorshubovych/markdownlint-cli/issues/258