diff --git a/Gemfile b/Gemfile
index a37d069cd176495deaed6ec49e572e6656b97f75..052ffbe2712a58205547ba19d004af922a01194e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -418,10 +418,7 @@ end
 
 # Gems required in omnibus-gitlab pipeline
 group :development, :test, :omnibus do
-  # Using a fork until https://github.com/pivotal/LicenseFinder/pull/816 is
-  # resolved. For details, check discussion in
-  # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74881
-  gem 'gitlab-license_finder', '~> 6.0', require: false
+  gem 'license_finder', '~> 7.0', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index b188a1733374edde9f969981f8671fa6dc69a101..8b5121dfd060091adbafca6025b513445451def4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -531,13 +531,6 @@ GEM
       pg_query (~> 2.1)
       redis (> 3.0.0, < 5.0.0)
     gitlab-license (2.2.1)
-    gitlab-license_finder (6.14.2.1)
-      bundler
-      rubyzip (>= 1, < 3)
-      thor (~> 1.0)
-      tomlrb (>= 1.3, < 2.1)
-      with_env (= 1.1.0)
-      xml-simple (~> 1.1.5)
     gitlab-mail_room (0.0.9)
     gitlab-markup (1.8.0)
     gitlab-net-dns (0.9.1)
@@ -765,6 +758,13 @@ GEM
       railties (>= 5.2)
       rexml
     libyajl2 (1.2.0)
+    license_finder (7.0.1)
+      bundler
+      rubyzip (>= 1, < 3)
+      thor (~> 1.2)
+      tomlrb (>= 1.3, < 2.1)
+      with_env (= 1.1.0)
+      xml-simple (~> 1.1.9)
     licensee (9.14.1)
       dotenv (~> 2.0)
       octokit (~> 4.17)
@@ -1471,7 +1471,8 @@ GEM
     wisper (2.0.1)
     with_env (1.1.0)
     wmi-lite (1.0.5)
-    xml-simple (1.1.5)
+    xml-simple (1.1.9)
+      rexml
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yajl-ruby (1.4.3)
@@ -1576,7 +1577,6 @@ DEPENDENCIES
   gitlab-fog-azure-rm (~> 1.3.0)
   gitlab-labkit (~> 0.24.0)
   gitlab-license (~> 2.2.1)
-  gitlab-license_finder (~> 6.0)
   gitlab-mail_room (~> 0.0.9)
   gitlab-markup (~> 1.8.0)
   gitlab-net-dns (~> 0.9.1)
@@ -1626,6 +1626,7 @@ DEPENDENCIES
   kubeclient (~> 4.9.2)
   lefthook (~> 1.0.0)
   letter_opener_web (~> 2.0.0)
+  license_finder (~> 7.0)
   licensee (~> 9.14.1)
   lockbox (~> 0.6.2)
   lograge (~> 0.5)