diff --git a/buckets.json b/buckets.json
index 61e07ea0f4..1b8e1ff1d1 100644
--- a/buckets.json
+++ b/buckets.json
@@ -1,15 +1,15 @@
 {
     "Base": "https://github.com/shovel-org/Base",
     "main": "https://github.com/ScoopInstaller/Main",
-    "extras": "https://github.com/lukesampson/scoop-extras",
-    "versions": "https://github.com/ScoopInstaller/Versions",
-    "nerd-fonts": "https://github.com/matthewjberger/scoop-nerd-fonts",
+    "extras": "https://github.com/ScoopInstaller/Extras",
     "java": "https://github.com/ScoopInstaller/Java",
-    "php": "https://github.com/ScoopInstaller/PHP",
-    "games": "https://github.com/Calinou/scoop-games",
-    "nightlies": "https://github.com/ScoopInstaller/Nightlies",
+    "nerd-fonts": "https://github.com/matthewjberger/scoop-nerd-fonts",
     "nirsoft": "https://github.com/Ash258/Scoop-NirSoft",
-    "nonportable": "https://github.com/TheRandomLabs/scoop-nonportable",
     "jetbrains": "https://github.com/Ash258/Scoop-JetBrains",
-    "sysinternals": "https://github.com/Ash258/Scoop-SysInternals"
+    "sysinternals": "https://github.com/Ash258/Scoop-SysInternals",
+    "nonportable": "https://github.com/TheRandomLabs/scoop-nonportable",
+    "games": "https://github.com/Calinou/scoop-games",
+    "php": "https://github.com/ScoopInstaller/PHP",
+    "versions": "https://github.com/ScoopInstaller/Versions",
+    "nightlies": "https://github.com/ScoopInstaller/Nightlies"
 }
diff --git a/lib/Diagnostic.ps1 b/lib/Diagnostic.ps1
index d414b58cfa..e3a6b7fb70 100644
--- a/lib/Diagnostic.ps1
+++ b/lib/Diagnostic.ps1
@@ -76,7 +76,7 @@ function Test-DiagWindowsDefender {
     return $true
 }
 
-function Test-DiagMainBucketAdded {
+function Test-DiagBucket {
     <#
     .SYNOPSIS
         Test if main bucket was added after migration from core repository.
@@ -88,6 +88,8 @@ function Test-DiagMainBucketAdded {
     $verdict = $true
     $all = Get-LocalBucket
 
+    # Base, main added
+    # TODO: Drop main in near future for security reasons
     'main', 'Base' | ForEach-Object {
         if ($all -notcontains $_) {
             Write-UserMessage -Message "'$_' bucket is not added" -Warning
@@ -100,6 +102,20 @@ function Test-DiagMainBucketAdded {
         }
     }
 
+    # Extras changed
+    if ($all -contains 'extras') {
+        $path = Find-BucketDirectory -Name 'extras' -Root
+
+        if ((Invoke-GitCmd -Repository $path -Command 'remote' -Argument 'get-url', 'origin') -match 'lukesampson') {
+            Write-UserMessage -Message "'extras' bucket was moved" -Warning
+            Write-UserMessage -Message @(
+                '  Fixable with running following command:'
+                "    scoop bucket rm 'extras'; scoop bucket add 'extras'"
+            )
+            $verdict = $false
+        }
+    }
+
     return $verdict
 }
 
diff --git a/libexec/scoop-checkup.ps1 b/libexec/scoop-checkup.ps1
index 938c5f8e43..9f8785530a 100644
--- a/libexec/scoop-checkup.ps1
+++ b/libexec/scoop-checkup.ps1
@@ -26,7 +26,7 @@ if ($_err) { Stop-ScoopExecution -Message "scoop checkup: $_err" -ExitCode 2 }
 
 $Problems += !(Test-DiagWindowsDefender)
 $Problems += !(Test-DiagWindowsDefender -Global)
-$Problems += !(Test-DiagMainBucketAdded)
+$Problems += !(Test-DiagBucket)
 $Problems += !(Test-DiagLongPathEnabled)
 $Problems += !(Test-DiagEnvironmentVariable)
 $Problems += !(Test-DiagHelpersInstalled)