diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
index 7196708b21af51..91f82b842bf802 100644
--- a/.github/codeql/codeql-config.yml
+++ b/.github/codeql/codeql-config.yml
@@ -1,4 +1,3 @@
 name: "CodeQL config for the Ruby language"
 
-paths-ignore:
-  - '/ext/**/*/conftest.c'
+languages: cpp
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index cffb12b2dec390..19ad77d3932201 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -21,8 +21,6 @@ jobs:
 
     - name: Checkout repository
       uses: actions/checkout@v2
-      with:
-        fetch-depth: 2
 
     - name: Remove an obsolete rubygems vendored file
       run: sudo rm /usr/lib/ruby/vendor_ruby/rubygems/defaults/operating_system.rb
@@ -30,7 +28,6 @@ jobs:
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
       with:
-        languages: cpp
         config-file: ./.github/codeql/codeql-config.yml
 
     - name: Autobuild