diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4553a4..b8bec5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- `Write-Message` uses `Write-Warning` & `Write-Error` accordingly rather than `Write-Host` with colour (#136)
 - Updated `Get-FabricWorkspaceUser` to support pipeline input for `WorkspaceId` and `WorkspaceName` parameters.
 - Renamed `Get-FabricWorkspaceUsers` to match the singular form
 - `Get-FabricSqlDatabase` accepts Workspace as a pipeline, handles errors correctly and can filter by name (#117).
diff --git a/source/Private/Write-Message.ps1 b/source/Private/Write-Message.ps1
index 80da8e1..0143539 100644
--- a/source/Private/Write-Message.ps1
+++ b/source/Private/Write-Message.ps1
@@ -41,7 +41,7 @@ function Write-Message {
         [string]$Message,
 
         [Parameter()]
-        [ValidateSet("Message","Info", "Error", "Warning","Critical", "Verbose", "Debug", IgnoreCase = $true)]
+        [ValidateSet("Message", "Info", "Error", "Warning", "Critical", "Verbose", "Debug", IgnoreCase = $true)]
         [string]$Level = "Info",
 
         [Parameter()]
@@ -58,14 +58,13 @@ function Write-Message {
 
             # Write log message to console with colors
             switch ($Level) {
-                "Message" { Write-Host $logMessage -ForegroundColor White }
-                "Info" { Write-Host $logMessage -ForegroundColor Green }
-                "Error" { Write-Host $logMessage -ForegroundColor Red }
-                "Warning" { Write-Host $logMessage -ForegroundColor Yellow } 
-                "Critical" { Write-Host $logMessage -ForegroundColor Red }
-                "Verbose" { Write-Verbose $logMessage }
-                "Debug" { Write-Debug $logMessage }
-
+                "Message"  { Write-Host    $logMessage -ForegroundColor White }
+                "Info"     { Write-Host    $logMessage -ForegroundColor Green }
+                "Error"    { Write-Error   $logMessage }
+                "Warning"  { Write-Warning $logMessage }
+                "Critical" { Write-Host    $logMessage -ForegroundColor Red }    # Or maybe Stop-PSFunction here?
+                "Verbose"  { Write-Verbose $logMessage }
+                "Debug"    { Write-Debug   $logMessage }
             }
 
             # Optionally write log message to a file