diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
index 43d7818..5014549 100644
--- a/.github/workflows/rubocop.yml
+++ b/.github/workflows/rubocop.yml
@@ -10,8 +10,6 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
-    env:
-      BUNDLER_VERSION: 4.0.6
 
     steps:
     - uses: actions/checkout@v6
@@ -19,12 +17,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: "4.0"
-    - name: Pin Bundler to 4.0.6 (workaround for ruby/rubygems#9536)
-      run: |
-        gem install bundler -v 4.0.6
-        ruby --version
-        gem --version
-        bundle --version
+        rubygems: latest
     - name: Build and run RuboCop
       run: |
         BUNDLE_ONLY=rubocop bundle install --jobs 4 --retry 3
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4dbfe81..482f482 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -50,6 +50,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
+        rubygems: latest
     - name: Create symbolic link for libaio library compatibility
       run: |
         sudo ln -s /usr/lib/x86_64-linux-gnu/libaio.so.1t64 /usr/lib/x86_64-linux-gnu/libaio.so.1
diff --git a/.github/workflows/test_11g.yml b/.github/workflows/test_11g.yml
index 88a2ddc..17051c6 100644
--- a/.github/workflows/test_11g.yml
+++ b/.github/workflows/test_11g.yml
@@ -56,6 +56,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
+        rubygems: latest
     - name: Create symbolic link for libaio library compatibility
       run: |
         sudo ln -s /usr/lib/x86_64-linux-gnu/libaio.so.1t64 /usr/lib/x86_64-linux-gnu/libaio.so.1
diff --git a/.github/workflows/test_11g_ojdbc11.yml b/.github/workflows/test_11g_ojdbc11.yml
index 3078128..f6457f2 100644
--- a/.github/workflows/test_11g_ojdbc11.yml
+++ b/.github/workflows/test_11g_ojdbc11.yml
@@ -52,6 +52,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
+        rubygems: latest
     - name: Create symbolic link for libaio library compatibility
       run: |
         sudo ln -s /usr/lib/x86_64-linux-gnu/libaio.so.1t64 /usr/lib/x86_64-linux-gnu/libaio.so.1