diff --git a/scripts/Enable-ExpiryIndicator.ps1 b/scripts/Enable-ExpiryIndicator.ps1
index 59f66b1..71fddf3 100644
--- a/scripts/Enable-ExpiryIndicator.ps1
+++ b/scripts/Enable-ExpiryIndicator.ps1
@@ -49,7 +49,9 @@ try {
 
     $commandAction.Name = 'ExpiryIndicator.CommandSet'
     $commandAction.Title = 'ExpiryIndicator commands'
-    $commandAction.Location = 'ClientSideExtension.ListViewCommandSet.CommandBar'
+    # SPUserCustomAction uses the classic location value; SharePoint maps it to
+    # the SPFx command bar and item context menu when ClientSideComponentId is set.
+    $commandAction.Location = 'CommandUI.Ribbon'
     $commandAction.ClientSideComponentId = $CommandSetComponentId
     $commandAction.ClientSideComponentProperties = '{}'
     $commandAction.Update()
diff --git a/scripts/Test-ExpiryIndicatorRegistration.ps1 b/scripts/Test-ExpiryIndicatorRegistration.ps1
index 66c5028..b277753 100644
--- a/scripts/Test-ExpiryIndicatorRegistration.ps1
+++ b/scripts/Test-ExpiryIndicatorRegistration.ps1
@@ -33,6 +33,7 @@ try {
     Write-Host 'List User Custom Actions:'
 
     $actions = @($customActions | Where-Object {
+        $_.Location -eq 'CommandUI.Ribbon' -or
         $_.Location -like 'ClientSideExtension.ListViewCommandSet*' -or
         $_.Name -like 'ExpiryIndicator*'
     })