diff --git a/Directory.Build.props b/Directory.Build.props
index 40db133..655650a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -32,7 +32,7 @@
     <Copyright>© $([System.DateTime]::UtcNow.Year) $(Authors)</Copyright>
     <PackageLicenseExpression>ISC</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/sharpjs/PSql</PackageProjectUrl>
-    <PackageTags>PowerShell SQL Server Azure Invoke SqlCmd</PackageTags>
+    <PackageTags>powershell sql sql-server azure invoke sqlcmd</PackageTags>
     <PackageReleaseNotes>$(PackageProjectUrl)/blob/master/CHANGES.md</PackageReleaseNotes>
     <PackageIcon>icon.png</PackageIcon>
     <RepositoryType>git</RepositoryType>
diff --git a/PSql/PSql.psd1.t b/PSql/PSql.psd1.t
index 9a882df..4b8358d 100644
--- a/PSql/PSql.psd1.t
+++ b/PSql/PSql.psd1.t
@@ -61,7 +61,7 @@
             LicenseUri   = 'https://github.com/sharpjs/PSql/blob/master/LICENSE.txt'
             IconUri      = 'https://github.com/sharpjs/PSql/blob/master/icon.png'
             Tags         = @(
-                "SQL", "Server", "Azure", "Invoke", "SqlCmd",
+                "SQL", "SqlServer", "Azure", "Invoke", "SqlCmd",
                 "PSEdition_Core", "Windows", "Linux", "MacOS"
             )
         }