diff --git a/Library/Homebrew/tap.rb b/Library/Homebrew/tap.rb
index 545d91cd76..31c36dbc04 100644
--- a/Library/Homebrew/tap.rb
+++ b/Library/Homebrew/tap.rb
@@ -988,19 +988,20 @@ class Tap
   # Array with autobump names
   sig { returns(T::Array[String]) }
   def autobump
-    # TODO: uncomment when official taps are prepared to use new autobump system
-    #
-    # autobump_packages = if core_cask_tap?
-    #   Homebrew::API::Cask.all_casks
-    # elsif core_tap?
-    #   Homebrew::API::Formula.all_formulae
-    # else
-    #   {}
-    # end
-    #
-    # @autobump ||= autobump_packages.select do |_, p|
-    #   p["autobump"] == true && !p["skip_livecheck"] && !(p["deprecated"] || p["disabled"])
-    # end.keys
+    autobump_packages = if core_cask_tap?
+      Homebrew::API::Cask.all_casks
+    elsif core_tap?
+      Homebrew::API::Formula.all_formulae
+    else
+      {}
+    end
+
+    @autobump ||= autobump_packages.select do |_, p|
+      next if p["deprecated"] || p["disabled"]
+      next if p["skip_livecheck"]
+
+      p["autobump"] == true
+    end.keys
 
     if @autobump.blank?
       @autobump = if (autobump_file = path/HOMEBREW_TAP_AUTOBUMP_FILE).file?