diff --git a/Pipelines/Templates/build-Solution.yml b/Pipelines/Templates/build-Solution.yml
index fccbd063..01ada634 100644
--- a/Pipelines/Templates/build-Solution.yml
+++ b/Pipelines/Templates/build-Solution.yml
@@ -134,13 +134,13 @@ steps:
   
 # Third party task to replace tokens in files. The FileTransform above replaces JSON tokens based on their path as opposed to replacing text tokens in a file which can be more error prone in some cases.
 # If you aren't using this task it can be safely removed or disabled by setting enabled: false. Sample token: #{VariableNameToReplace}#
-- task: qetza.replacetokens.replacetokens-task.replacetokens@3
+- task: qetza.replacetokens.replacetokens-task.replacetokens@6
   displayName: 'Replace Tokens: deploymentSettings.json'
   inputs:
-    rootDirectory: $(Build.SourcesDirectory)\$(RepoName)\${{parameters.solutionName}}\config\
-    targetFiles: '**\*deploymentSettings*.json'
-    actionOnMissing: 'silently continue'
-    writeBOM: false
+    root: $(Build.SourcesDirectory)\$(RepoName)\${{parameters.solutionName}}\config\
+    sources: '**\*deploymentSettings*.json'
+    missingVarLog: 'off'
+    addBOM: false
     encoding: 'utf-8'
     defaultValue: ''
   condition: and(succeeded(), or(ne(variables['DeploymentSettingsPath'], ''), ne(variables['CustomDeploymentSettingsPath'], '')))
diff --git a/Pipelines/Templates/deploy-Solution.yml b/Pipelines/Templates/deploy-Solution.yml
index c185a32a..c7a1126c 100644
--- a/Pipelines/Templates/deploy-Solution.yml
+++ b/Pipelines/Templates/deploy-Solution.yml
@@ -103,13 +103,13 @@ steps:
 
 # Third party task to replace tokens in files. The FileTransform above replaces JSON tokens based on their path as opposed to replacing text tokens in a file which can be more error prone in some cases.
 # If you aren't using this task it can be safely removed or disabled by setting enabled: false. Sample token: #{VariableNameToReplace}#
-- task: qetza.replacetokens.replacetokens-task.replacetokens@3
+- task: qetza.replacetokens.replacetokens-task.replacetokens@6
   displayName: 'Replace Tokens: deploymentSettings.json'
   inputs:
-    rootDirectory: '$(Pipeline.Workspace)'
-    targetFiles: '**\*deploymentSettings*.json'
-    actionOnMissing: 'silently continue'
-    writeBOM: false
+    root: '$(Pipeline.Workspace)'
+    sources: '**\*deploymentSettings*.json'
+    missingVarLog: 'off'
+    addBOM: false
     encoding: 'utf-8'
     defaultValue: ''
   condition: and(succeeded(), or(ne(variables['DeploymentSettingsPath'], ''), ne(variables['CustomDeploymentSettingsPath'], '')))
diff --git a/PowerShell/branch-pipeline-policy.ps1 b/PowerShell/branch-pipeline-policy.ps1
index 74a0d76f..b29eb56b 100644
--- a/PowerShell/branch-pipeline-policy.ps1
+++ b/PowerShell/branch-pipeline-policy.ps1
@@ -841,4 +841,4 @@ function Download-File-to-Location{
     }
 
     return $false
-}
\ No newline at end of file
+}
diff --git a/devops-tasks-schema.json b/devops-tasks-schema.json
index 80633ae8..78124328 100644
--- a/devops-tasks-schema.json
+++ b/devops-tasks-schema.json
@@ -4421,7 +4421,7 @@
                             "doNotSuggest": false,
                             "ignoreCase": "value",
                             "enum": [
-                                "replacetokens@3"
+                                "replacetokens@6"
                             ]
                         },
                         {