diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c3830ce..0f6c01b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -34,18 +34,24 @@ variables:
     value: SDS_Python
   - name: BLACK_DUCK_PROJECT_NAME
     value: SDS_Python
+  - name: containerDemands
+    value: ['Agent.OS -equals Linux', 'PYTHON']
 
 parameters:
+  - name: poolADH
+    default: 00-OSIManaged-Containers
   - name: containerDemandsADH
-    default: Agent.OS -equals Linux
+    type: object
+    default: ['Agent.OS -equals Linux']
   - name: containerDemandsEDS
-    default: PYTHON
+    type: object
+    default: ['PYTHON']
 
 jobs:
   - job: Tests_ADH
     pool:
-      name: 00-OSIManaged-Containers
-      demands: ${{ parameters.containerDemandsADH }}
+      name: ${{ parameters.poolADH }}
+      demands: ${{ variables.containerDemands }}
     steps:
       - template: '/miscellaneous/build_templates/appsettings.yml@templates'
         parameters: