diff --git a/modules/openapi-generator/src/main/resources/powershell/appveyor.mustache b/modules/openapi-generator/src/main/resources/powershell/appveyor.mustache
index f337f619ba0..0f70eb14ecf 100644
--- a/modules/openapi-generator/src/main/resources/powershell/appveyor.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/appveyor.mustache
@@ -3,7 +3,6 @@ version: 1.0.{build}
 image:
   - Visual Studio 2017 # PS 5.x
   - Ubuntu # PS 6.x
-  - macOS # PS 6.x
 install:
   - ps: $PSVersionTable.PSVersion
   - ps: Install-Module Pester -Force -Scope CurrentUser
@@ -15,10 +14,17 @@ test_script:
           $host.SetShouldExit($Result.FailedCount)
           exit $Result.FailedCount
       }
+deploy_script:
   - ps: |
-      if ($env:APPVEYOR_REPO_TAG -eq $true -and $env:NuGetApiKey -ne $null)
-      {
+      if ($env:APPVEYOR_REPO_TAG -eq $true -and $env:NuGetApiKey -ne $null -and $env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2017") {
+          .\Build.ps1
           choco install NuGet.CommandLine
           Install-PackageProvider -Name NuGet -Force
-          Publish-Module -NuGetApiKey $env:NuGetApiKey -Path .\ -Confirm:$False -Verbose
+          Publish-Module -NuGetApiKey $env:NuGetApiKey -Path .\src\{{{packageName}}}\ -Confirm:$False -Verbose
+          if ($LastExitCode -ne 0) {
+              $host.SetShouldExit($LastExitCode)
+              exit $LastExitCode
+          } else {
+              Write-Host "Published the PowerShell module."
+          }
       }
diff --git a/samples/client/petstore/powershell/appveyor.yml b/samples/client/petstore/powershell/appveyor.yml
index ec43839e3e3..1d3959705c8 100644
--- a/samples/client/petstore/powershell/appveyor.yml
+++ b/samples/client/petstore/powershell/appveyor.yml
@@ -9,7 +9,6 @@ version: 1.0.{build}
 image:
   - Visual Studio 2017 # PS 5.x
   - Ubuntu # PS 6.x
-  - macOS # PS 6.x
 install:
   - ps: $PSVersionTable.PSVersion
   - ps: Install-Module Pester -Force -Scope CurrentUser
@@ -21,10 +20,17 @@ test_script:
           $host.SetShouldExit($Result.FailedCount)
           exit $Result.FailedCount
       }
+deploy_script:
   - ps: |
-      if ($env:APPVEYOR_REPO_TAG -eq $true -and $env:NuGetApiKey -ne $null)
-      {
+      if ($env:APPVEYOR_REPO_TAG -eq $true -and $env:NuGetApiKey -ne $null -and $env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2017") {
+          .\Build.ps1
           choco install NuGet.CommandLine
           Install-PackageProvider -Name NuGet -Force
-          Publish-Module -NuGetApiKey $env:NuGetApiKey -Path .\ -Confirm:$False -Verbose
+          Publish-Module -NuGetApiKey $env:NuGetApiKey -Path .\src\PSPetstore\ -Confirm:$False -Verbose
+          if ($LastExitCode -ne 0) {
+              $host.SetShouldExit($LastExitCode)
+              exit $LastExitCode
+          } else {
+              Write-Host "Published the PowerShell module."
+          }
       }