diff --git a/template-compliance/apiscan.yml b/template-compliance/apiscan.yml
index 601d4d3..debc520 100644
--- a/template-compliance/apiscan.yml
+++ b/template-compliance/apiscan.yml
@@ -5,13 +5,13 @@ parameters:
   APIScanEnable: ''
 
 steps:
-- task: securedevelopmentteam.vss-secure-development-tools.build-task-apiscan.APIScan@2
-  displayName: 'Run APIScan'
-  inputs:
-    softwareFolder: ${{ parameters.softwareFolder }}
-    softwareName: ${{ parameters.softwareName }}
-    softwareVersionNum: ${{ parameters.softwareVersion }}
-    isLargeApp: false
-    preserveTempFiles: true
-  continueOnError: true
-  condition: eq(variables['APIScanEnable'], true)
+- ${{ if eq(parameters.APIScanEnable, 'true') }}:
+  - task: securedevelopmentteam.vss-secure-development-tools.build-task-apiscan.APIScan@2
+    displayName: 'Run APIScan'
+    inputs:
+      softwareFolder: ${{ parameters.softwareFolder }}
+      softwareName: ${{ parameters.softwareName }}
+      softwareVersionNum: ${{ parameters.softwareVersion }}
+      isLargeApp: false
+      preserveTempFiles: true
+    continueOnError: true
diff --git a/template-compliance/credscan.yml b/template-compliance/credscan.yml
index a876ed1..1ced986 100644
--- a/template-compliance/credscan.yml
+++ b/template-compliance/credscan.yml
@@ -7,4 +7,5 @@ steps:
   inputs:
     suppressionsFile: ${{ parameters.suppressionsFile }}
     debugMode: false
+    toolMajorVersion: V2
   continueOnError: true