diff --git a/avm/res/automation/automation-account/tests/e2e/waf-aligned/main.test.bicep b/avm/res/automation/automation-account/tests/e2e/waf-aligned/main.test.bicep
index 77060749ab..7b75313d78 100644
--- a/avm/res/automation/automation-account/tests/e2e/waf-aligned/main.test.bicep
+++ b/avm/res/automation/automation-account/tests/e2e/waf-aligned/main.test.bicep
@@ -228,7 +228,7 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem'
       }
       {
         description: 'TestDateTimeDescription'
-        isEncrypted: false
+        //isEncrypted: false
         name: 'TestDateTime'
         value: '\'\\/Date(1637934042656)\\/\''
       }
diff --git a/avm/utilities/pipelines/staticValidation/psrule/ps-rule.yaml b/avm/utilities/pipelines/staticValidation/psrule/ps-rule.yaml
index 1428ebaeff..54c1430564 100644
--- a/avm/utilities/pipelines/staticValidation/psrule/ps-rule.yaml
+++ b/avm/utilities/pipelines/staticValidation/psrule/ps-rule.yaml
@@ -49,7 +49,7 @@ configuration:
   AZURE_BICEP_FILE_EXPANSION_TIMEOUT: 10
 
   # Custom non-sensitive parameters' names
-  AZURE_DEPLOYMENT_NONSENSITIVE_PARAMETER_NAMES: ["sasTokenValidityLength"]
+  AZURE_DEPLOYMENT_NONSENSITIVE_PARAMETER_NAMES: ["*TokenValidityLength"]
 
 rule:
   # Enable custom rules that don't exist in the baseline