diff --git a/e2e/test/iothub/FileUploadE2ETests.cs b/e2e/test/iothub/FileUploadE2ETests.cs
index f56f806069..ad70529a70 100644
--- a/e2e/test/iothub/FileUploadE2ETests.cs
+++ b/e2e/test/iothub/FileUploadE2ETests.cs
@@ -98,6 +98,7 @@ public async Task FileUpload_X509_SmallFile_Http()
         [TestMethodWithRetry(Max = 3)]
         [Timeout(TestTimeoutMilliseconds)]
         [TestCategory("LongRunning")]
+        [Ignore()]        
         public async Task FileUpload_SmallFile_Http_GranularSteps()
         {
             string filename = await GetTestFileNameAsync(FileSizeSmall).ConfigureAwait(false);
@@ -110,6 +111,7 @@ public async Task FileUpload_SmallFile_Http_GranularSteps()
         [TestMethodWithRetry(Max = 3)]
         [Timeout(TestTimeoutMilliseconds)]
         [TestCategory("LongRunning")]
+        [Ignore()]
         public async Task FileUpload_SmallFile_Http_GranularSteps_x509()
         {
             string filename = await GetTestFileNameAsync(FileSizeSmall).ConfigureAwait(false);
@@ -123,6 +125,7 @@ public async Task FileUpload_SmallFile_Http_GranularSteps_x509()
         [Timeout(TestTimeoutMilliseconds)]
         [TestCategory("LongRunning")]
         [TestCategory("Proxy")]
+        [Ignore()]
         public async Task FileUpload_SmallFile_Http_GranularSteps_Proxy()
         {
             string filename = await GetTestFileNameAsync(FileSizeSmall).ConfigureAwait(false);
diff --git a/e2e/test/iothub/service/RegistryManagerExportDevicesTests.cs b/e2e/test/iothub/service/RegistryManagerExportDevicesTests.cs
index b379a3ee20..f676b5d5cb 100644
--- a/e2e/test/iothub/service/RegistryManagerExportDevicesTests.cs
+++ b/e2e/test/iothub/service/RegistryManagerExportDevicesTests.cs
@@ -31,6 +31,7 @@ public class RegistryManagerExportDevicesTests : E2EMsTestBase
             '\n',
         };
 
+        [Ignore("Test infrastructure doesn't currently support this test")]
         [TestMethodWithRetry(Max = 3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         [TestCategory("LongRunning")]
diff --git a/vsts/vsts.yaml b/vsts/vsts.yaml
index 8bc9c2622f..8ad366a8c3 100644
--- a/vsts/vsts.yaml
+++ b/vsts/vsts.yaml
@@ -337,7 +337,7 @@ jobs:
           SHOULD_RUN: ${{ eq(variables['testNet472'], 'True') }}
     pool:
       # If this is changed, don't forget to update supported_platforms.md in the root directory. That document outlines what OS we test on and should stay up to date.
-      vmImage: windows-2022
+      name: 'sdk-net--win-vs2022'
     steps:
       - task: PowerShell@2
         displayName: 'Print vars'
@@ -377,13 +377,26 @@ jobs:
         - task: CmdLine@2
           displayName: 'Install .NET 4.7.2'
           inputs:
-            script: 'choco install netfx-4.7.2-devpack'
+            script: 'choco install -y netfx-4.7.2-devpack'
 
-      - script: |
-          choco install -y squid
+      - task: Docker@2
+        displayName: "Login to ACR"
+        condition: eq(variables.SHOULD_RUN, 'True')
+        inputs:
+          command: "login"
+          containerRegistry: "Azure IoT ACR"
 
-        displayName: "Install Squid"
+      - task: Docker@1
+        displayName: "Start Test Proxy"
         condition: eq(variables.SHOULD_RUN, 'True')
+        inputs:
+          containerregistrytype: "Container Registry"
+          command: "Run an image"
+          azureContainerRegistry: aziotacr.azurecr.io
+          imageName: aziotacr.azurecr.io/aziotbld/testproxy
+          containerName: "testproxy-instance"
+          ports: "127.0.0.1:8888:8888"
+          restartPolicy: unlessStopped
 
       - powershell: ./vsts/start_tpm_windows.ps1
         displayName: "Start TPM Simulator"
@@ -424,7 +437,7 @@ jobs:
           E2E_IKEY: $(E2E-IKEY)
 
           # Environment variables for the DevOps pipeline
-          PROXY_SERVER_ADDRESS: 127.0.0.1:3128
+          PROXY_SERVER_ADDRESS: 127.0.0.1:8888
           TARGET_BRANCH: $(System.PullRequest.TargetBranch)
           FRAMEWORK: $(FRAMEWORK)