diff --git a/vsts/build.yaml b/vsts/build.yaml
index 48f263e84..816d454ec 100644
--- a/vsts/build.yaml
+++ b/vsts/build.yaml
@@ -85,6 +85,7 @@ jobs:
 
   - script: |
       pip install wheel
+      pip install setuptools
       python scripts/build_packages.py
     displayName: Build source and wheel distribution
 
diff --git a/vsts/dps-e2e.yaml b/vsts/dps-e2e.yaml
index 547bc5d7f..1c211caea 100644
--- a/vsts/dps-e2e.yaml
+++ b/vsts/dps-e2e.yaml
@@ -31,19 +31,19 @@ jobs:
     displayName: 'Run Specified E2E Test with env variables'
 
     env:
-      IOTHUB_CONNECTION_STRING: $(PYTHONOCT22-MAC-IOTHUB-CONNECTION-STRING)
-      IOTHUB_EVENTHUB_CONNECTION_STRING: $(PYTHONOCT22-MAC-IOTHUB-EVENTHUB-CONNECTION-STRING)
-      IOTHUB_CA_ROOT_CERT: $(PYTHONOCT22-MAC-IOTHUB-CA-ROOT-CERT)
-      IOTHUB_CA_ROOT_CERT_KEY: $(PYTHONOCT22-MAC-IOTHUB-CA-ROOT-CERT-KEY)
-      STORAGE_CONNECTION_STRING: $(PYTHONOCT22-MAC-STORAGE-CONNECTION-STRING)
-
-      PROVISIONING_DEVICE_ENDPOINT: $(PYTHONOCT22-MAC-DPS-DEVICE-ENDPOINT)
-      PROVISIONING_SERVICE_CONNECTION_STRING: $(PYTHONOCT22-MAC-DPS-CONNECTION-STRING)
-      PROVISIONING_DEVICE_IDSCOPE: $(PYTHONOCT22-MAC-DPS-ID-SCOPE)
-
-      PROVISIONING_ROOT_CERT: $(PYTHONOCT22-MAC-IOT-PROVISIONING-ROOT-CERT)
-      PROVISIONING_ROOT_CERT_KEY: $(PYTHONOCT22-MAC-IOT-PROVISIONING-ROOT-CERT-KEY)
-      PROVISIONING_ROOT_PASSWORD: $(PYTHONOCT22-MAC-ROOT-CERT-PASSWORD)
+      IOTHUB_CONNECTION_STRING: $(PYTHONV2JAN-IOTHUB-CONNECTION-STRING)
+      IOTHUB_EVENTHUB_CONNECTION_STRING: $(PYTHONV2JAN-IOTHUB-EVENTHUB-CONNECTION-STRING)
+      IOTHUB_CA_ROOT_CERT: $(PYTHONV2JAN-LINUX-IOTHUB-CA-ROOT-CERT)
+      IOTHUB_CA_ROOT_CERT_KEY: $(PYTHONV2JAN-LINUX-IOTHUB-CA-ROOT-CERT-KEY)
+      STORAGE_CONNECTION_STRING: $(PYTHONV2JAN-IOTHUB-STORAGE-CONNECTION-STRING)
+
+      PROVISIONING_DEVICE_ENDPOINT: $(PYTHONV2JAN-LINUX-DPS-DEVICE-ENDPOINT)
+      PROVISIONING_SERVICE_CONNECTION_STRING: $(PYTHONV2JAN-DPS-CONNECTION-STRING)
+      PROVISIONING_DEVICE_IDSCOPE: $(PYTHONV2JAN-LINUX-DPS-ID-SCOPE)
+
+      PROVISIONING_ROOT_CERT: $(PYTHONV2JAN-LINUX-IOT-PROVISIONING-ROOT-CERT)
+      PROVISIONING_ROOT_CERT_KEY: $(PYTHONV2JAN-LINUX-IOT-PROVISIONING-ROOT-CERT-KEY)
+      PROVISIONING_ROOT_PASSWORD: $(PYTHONV2JAN-LINUX-ROOT-CERT-PASSWORD)
       PYTHONUNBUFFERED: True
 
   - task: PublishTestResults@2