diff --git a/RELEASE.md b/RELEASE.md
index 3b4a5908..6e600871 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1 +1 @@
-- Fix `Set-CmAttribute` not honoring $null for all attribute types
+- Replace `New-TrustMachineIis` with `New-TrustMachineMicrosoft` to support IIS, Windows (PowerShell), and SQL machine types
\ No newline at end of file
diff --git a/VenafiPS/Public/New-TrustMachineIis.ps1 b/VenafiPS/Public/New-TrustMachineMicrosoft.ps1
similarity index 91%
rename from VenafiPS/Public/New-TrustMachineIis.ps1
rename to VenafiPS/Public/New-TrustMachineMicrosoft.ps1
index 29a2b675..4b2a2cd9 100644
--- a/VenafiPS/Public/New-TrustMachineIis.ps1
+++ b/VenafiPS/Public/New-TrustMachineMicrosoft.ps1
@@ -1,13 +1,16 @@
-function New-TrustMachineIis {
+function New-TrustMachineMicrosoft {
     <#
     .SYNOPSIS
-    Create a new IIS machine
+    Create a new IIS, Windows PowerShell, or SQL machine
 
     .DESCRIPTION
-    Create a new IIS machine with either basic or kerberos authentication.
+    Create a new IIS, Windows PowerShell, or SQL machine with either basic or kerberos authentication.
     By default, the machine details will be verified by performing a test connection; this can be turned off with -NoVerify.
     Creation will occur in parallel and PowerShell v7+ is required.
 
+    .PARAMETER MachineType
+    Type of machine to create.  Valid values are 'IIS', 'PowerShell', or 'SQL'.  The default is 'IIS'.
+
     .PARAMETER Name
     Machine name
 
@@ -75,6 +78,7 @@ function New-TrustMachineIis {
 
     .EXAMPLE
     $params = @{
+        MachineType = 'IIS'
         Name = 'iis1'
         Owner = 'MyTeam'
         Hostname = 'iis1.company.com'
@@ -108,9 +112,15 @@ function New-TrustMachineIis {
 
     [CmdletBinding(DefaultParameterSetName = 'WinrmBasic')]
     [Alias('New-VcMachineIis')]
+    [Alias('New-TrustMachineIis')]
     [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseSingularNouns', '', Justification = 'IIS is not plural')]
 
     param (
+
+        [Parameter()]
+        [ValidateSet('IIS', 'PowerShell', 'SQL')]
+        [string] $MachineType = 'IIS',
+
         [Parameter(Mandatory, ValueFromPipeline, ValueFromPipelineByPropertyName)]
         [ValidateNotNullOrEmpty()]
         [string] $Name,
@@ -173,7 +183,13 @@ function New-TrustMachineIis {
 
 
         $allMachines = [System.Collections.Generic.List[pscustomobject]]::new()
-        $machineTypeId = Get-TrustData -InputObject 'Microsoft IIS' -Type 'Plugin'
+
+        $machineTypeFull = switch ($MachineType) {
+            'IIS'        { 'Microsoft IIS' }
+            'PowerShell' { 'Microsoft Windows (PowerShell)' }
+            'SQL'        { 'Microsoft SQL Server' }
+        }
+        $machineTypeId = Get-TrustData -InputObject $machineTypeFull -Type 'Plugin'
 
         Initialize-PSSodium -Force:$Force
     }
diff --git a/VenafiPS/VenafiPS.psd1 b/VenafiPS/VenafiPS.psd1
index 7a082b6f..ee6fd55e 100644
--- a/VenafiPS/VenafiPS.psd1
+++ b/VenafiPS/VenafiPS.psd1
@@ -91,7 +91,7 @@ FunctionsToExport = 'Add-CmsTeamMember', 'Add-CmsTeamOwner', 'Add-CmAdaptableHas
                'Invoke-CmCertificateAction', 'Invoke-TrustRestMethod',
                'Move-CmObject', 'New-CmsApplication', 'New-TrustCertificate',
                'New-TrustConnector', 'New-TrustMachine',
-               'New-TrustMachineCommonKeystore', 'New-TrustMachineIis',
+               'New-TrustMachineCommonKeystore', 'New-TrustMachineMicrosoft',
                'New-CmsTeam', 'New-TrustWebhook', 'New-CmCapiApplication',
                'New-CmCertificate', 'New-CmCustomField', 'New-CmDevice',
                'New-CmObject', 'New-CmPolicy', 'New-CmTeam', 'New-TrustClient',