diff --git a/modules/openapi-generator/src/main/resources/powershell/README.mustache b/modules/openapi-generator/src/main/resources/powershell/README.mustache
index e8092a38a6b..a6bee1f3195 100644
--- a/modules/openapi-generator/src/main/resources/powershell/README.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/README.mustache
@@ -92,10 +92,18 @@ No model defined in this package
 - **API key parameter name**: {{keyParamName}}
 - **Location**: {{#isKeyInQuery}}URL query string{{/isKeyInQuery}}{{#isKeyInHeader}}HTTP header{{/isKeyInHeader}}
 {{/isApiKey}}
-{{#isBasic}}
+{{#isBasicBasic}}
 
 - **Type**: HTTP basic authentication
-{{/isBasic}}
+{{/isBasicBasic}}
+{{#isBasicBearer}}
+
+- **Type**: HTTP Bearer Token authentication{{#bearerFormat}} ({{{.}}}){{/bearerFormat}}
+{{/isBasicBearer}}
+{{#isHttpSignature}}
+
+- **Type**: HTTP signature authentication
+{{/isHttpSignature}}
 {{#isOAuth}}
 
 - **Type**: OAuth
diff --git a/modules/openapi-generator/src/main/resources/powershell/api_doc.mustache b/modules/openapi-generator/src/main/resources/powershell/api_doc.mustache
index 3c117aa5e08..b049ec3152c 100644
--- a/modules/openapi-generator/src/main/resources/powershell/api_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/api_doc.mustache
@@ -27,11 +27,11 @@ Method | HTTP request | Description
 # general setting of the PowerShell module, e.g. base URL, authentication, etc
 $Configuration = Get-Configuration
 {{#authMethods}}
-{{#isBasic}}
+{{#isBasicBasic}}
 # Configure HTTP basic authorization: {{{name}}}
 $Configuration.Username = "YOUR_USERNAME"
 $Configuration.Password = "YOUR_PASSWORD"
-{{/isBasic}}
+{{/isBasicBasic}}
 {{#isApiKey}}
 # Configure API key authorization: {{{name}}}
 $Configuration.ApiKey.{{{keyParamName}}} = "YOUR_API_KEY"
diff --git a/samples/client/petstore/powershell/README.md b/samples/client/petstore/powershell/README.md
index c86373f9af2..0c5467c93b4 100644
--- a/samples/client/petstore/powershell/README.md
+++ b/samples/client/petstore/powershell/README.md
@@ -216,11 +216,11 @@ Authentication schemes defined for the API:
 ### bearer_test
 
 
-- **Type**: HTTP basic authentication
+- **Type**: HTTP Bearer Token authentication (JWT)
 
 <a id="http_signature_test"></a>
 ### http_signature_test
 
 
-- **Type**: HTTP basic authentication
+- **Type**: HTTP signature authentication
 
diff --git a/samples/client/petstore/powershell/docs/PSFakeApi.md b/samples/client/petstore/powershell/docs/PSFakeApi.md
index 6770e880133..4ae77c23678 100644
--- a/samples/client/petstore/powershell/docs/PSFakeApi.md
+++ b/samples/client/petstore/powershell/docs/PSFakeApi.md
@@ -560,9 +560,6 @@ Fake endpoint to test group parameters (optional)
 ```powershell
 # general setting of the PowerShell module, e.g. base URL, authentication, etc
 $Configuration = Get-Configuration
-# Configure HTTP basic authorization: bearer_test
-$Configuration.Username = "YOUR_USERNAME"
-$Configuration.Password = "YOUR_PASSWORD"
 
 $RequiredStringGroup = 56 # Int32 | Required String in group parameters
 $RequiredBooleanGroup = $true # Boolean | Required Boolean in group parameters
diff --git a/samples/client/petstore/powershell/docs/PSPetApi.md b/samples/client/petstore/powershell/docs/PSPetApi.md
index 4ff1c455a4a..bc720caf45a 100644
--- a/samples/client/petstore/powershell/docs/PSPetApi.md
+++ b/samples/client/petstore/powershell/docs/PSPetApi.md
@@ -31,9 +31,6 @@ $Configuration = Get-Configuration
 # Configure OAuth2 access token for authorization: petstore_auth
 $Configuration.AccessToken = "YOUR_ACCESS_TOKEN"
 
-# Configure HTTP basic authorization: http_signature_test
-$Configuration.Username = "YOUR_USERNAME"
-$Configuration.Password = "YOUR_PASSWORD"
 # Configure HttpSignature for authorization :http_signature_test
 $httpSigningParams = @{
     KeyId = "xxxxxx1776876789ac747/xxxxxxx564612d31a62c01/xxxxxxxa1d7564612d31a66ee8"
@@ -144,9 +141,6 @@ $Configuration = Get-Configuration
 # Configure OAuth2 access token for authorization: petstore_auth
 $Configuration.AccessToken = "YOUR_ACCESS_TOKEN"
 
-# Configure HTTP basic authorization: http_signature_test
-$Configuration.Username = "YOUR_USERNAME"
-$Configuration.Password = "YOUR_PASSWORD"
 # Configure HttpSignature for authorization :http_signature_test
 $httpSigningParams = @{
     KeyId = "xxxxxx1776876789ac747/xxxxxxx564612d31a62c01/xxxxxxxa1d7564612d31a66ee8"
@@ -204,9 +198,6 @@ $Configuration = Get-Configuration
 # Configure OAuth2 access token for authorization: petstore_auth
 $Configuration.AccessToken = "YOUR_ACCESS_TOKEN"
 
-# Configure HTTP basic authorization: http_signature_test
-$Configuration.Username = "YOUR_USERNAME"
-$Configuration.Password = "YOUR_PASSWORD"
 # Configure HttpSignature for authorization :http_signature_test
 $httpSigningParams = @{
     KeyId = "xxxxxx1776876789ac747/xxxxxxx564612d31a62c01/xxxxxxxa1d7564612d31a66ee8"
@@ -314,9 +305,6 @@ $Configuration = Get-Configuration
 # Configure OAuth2 access token for authorization: petstore_auth
 $Configuration.AccessToken = "YOUR_ACCESS_TOKEN"
 
-# Configure HTTP basic authorization: http_signature_test
-$Configuration.Username = "YOUR_USERNAME"
-$Configuration.Password = "YOUR_PASSWORD"
 # Configure HttpSignature for authorization :http_signature_test
 $httpSigningParams = @{
     KeyId = "xxxxxx1776876789ac747/xxxxxxx564612d31a62c01/xxxxxxxa1d7564612d31a66ee8"