diff --git a/ci/azure_pipelines/main.yml b/ci/azure_pipelines/main.yml
index ad5ea915c45e..efd152e9a7aa 100644
--- a/ci/azure_pipelines/main.yml
+++ b/ci/azure_pipelines/main.yml
@@ -5,6 +5,17 @@
 # The main reason that forced the Ray team to have Jenkings is
 # the travis limitation of two cores per environment.
 
+parameters:
+- name: ImageName
+  displayName: 'OS Image'
+  type: string
+  default: ubuntu-18.04
+  values:
+  - ubuntu-latest
+  - ubuntu-20.04
+  - ubuntu-18.04
+  - ubuntu-16.04
+
 name: $(BuildDefinitionName)_$(SourceBranchName)_$(BuildID)
 stages:
   - stage: RayBuild
@@ -17,7 +28,7 @@ stages:
         strategy:
           matrix:
             linux_python36:
-              imageName: 'ubuntu-16.04'
+              imageName: ${{ parameters.ImageName }}
               python.version: '3.6'
               bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
               TEST_TMPDIR: $(Agent.TempDirectory)
@@ -57,7 +68,7 @@ stages:
         strategy:
           matrix:
             linux_python36:
-              imageName: 'ubuntu-16.04'
+              imageName: ${{ parameters.ImageName }}
               python.version: '3.6'
               bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
               TEST_TMPDIR: $(Agent.TempDirectory)
@@ -97,7 +108,7 @@ stages:
         strategy:
           matrix:
             linux_python36:
-              imageName: 'ubuntu-16.04'
+              imageName: ${{ parameters.ImageName }}
               python.version: '3.6'
               bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
               TEST_TMPDIR: $(Agent.TempDirectory)
@@ -139,7 +150,7 @@ stages:
         strategy:
           matrix:
             linux_python36:
-              imageName: 'ubuntu-16.04'
+              imageName: ${{ parameters.ImageName }}
               python.version: '3.6'
               bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
               TEST_TMPDIR: $(Agent.TempDirectory)
@@ -178,7 +189,7 @@ stages:
           matrix:
             linux_python36:
               # poolName: 'ADORayTests'
-              imageName: 'ubuntu-16.04'
+              imageName: ${{ parameters.ImageName }}
               python.version: '3.6'
               bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
               TEST_TMPDIR: $(Agent.TempDirectory)
@@ -207,7 +218,7 @@ stages:
           matrix:
             linux_python36:
               # poolName: 'ADORayTests'
-              imageName: 'ubuntu-16.04'
+              imageName: ${{ parameters.ImageName }}
               python.version: '3.6'
               bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
               TEST_TMPDIR: $(Agent.TempDirectory)
@@ -236,7 +247,7 @@ stages:
           matrix:
             linux_python36:
               # poolName: 'ADORayTests'
-              imageName: 'ubuntu-16.04'
+              imageName: ${{ parameters.ImageName }}
               python.version: '3.6'
               bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
               TEST_TMPDIR: $(Agent.TempDirectory)
@@ -293,7 +304,7 @@ stages:
           matrix:
             python36:
               # poolName: 'ADORayTests'
-              imageName: 'ubuntu-16.04'
+              imageName: ${{ parameters.ImageName }}
               python.version: '3.6'
               bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
               TEST_TMPDIR: $(Agent.TempDirectory)
@@ -419,7 +430,7 @@ stages:
         strategy:
           matrix:
             linux_python36:
-              imageName: 'ubuntu-16.04'
+              imageName: ${{ parameters.ImageName }}
               python.version: '3.7'
               bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
               TEST_TMPDIR: $(Agent.TempDirectory)
@@ -450,7 +461,7 @@ stages:
         strategy:
           matrix:
             linux_python36:
-              imageName: 'ubuntu-16.04'
+              imageName: ${{ parameters.ImageName }}
               python.version: '3.6'
               bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
               TEST_TMPDIR: $(Agent.TempDirectory)
@@ -477,7 +488,7 @@ stages:
         strategy:
           matrix:
             linux_python36:
-              imageName: 'ubuntu-16.04'
+              imageName: ${{ parameters.ImageName }}
               python.version: '3.6'
               bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
               TEST_TMPDIR: $(Agent.TempDirectory)
@@ -504,7 +515,7 @@ stages:
         strategy:
           matrix:
             linux_python36:
-              imageName: 'ubuntu-16.04'
+              imageName: ${{ parameters.ImageName }}
               python.version: '3.6'
               bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
               TEST_TMPDIR: $(Agent.TempDirectory)
@@ -534,7 +545,7 @@ stages:
           matrix:
             linux_python36:
               # poolName: 'ADORayTests'
-              imageName: 'ubuntu-16.04'
+              imageName: ${{ parameters.ImageName }}
               python.version: '3.6'
               bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
               TEST_TMPDIR: $(Agent.TempDirectory)
@@ -563,7 +574,7 @@ stages:
           matrix:
             linux_python36:
               # poolName: 'ADORayTests'
-              imageName: 'ubuntu-16.04'
+              imageName: ${{ parameters.ImageName }}
               python.version: '3.6'
               bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
               TEST_TMPDIR: $(Agent.TempDirectory)
@@ -592,7 +603,7 @@ stages:
           matrix:
             linux_python36:
               # poolName: 'ADORayTests'
-              imageName: 'ubuntu-16.04'
+              imageName: ${{ parameters.ImageName }}
               python.version: '3.6'
               bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
               TEST_TMPDIR: $(Agent.TempDirectory)
@@ -621,7 +632,7 @@ stages:
           matrix:
             linux_python36:
               # poolName: 'ADORayTests'
-              imageName: 'ubuntu-16.04'
+              imageName: ${{ parameters.ImageName }}
               python.version: '3.6'
               bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
               TEST_TMPDIR: $(Agent.TempDirectory)
@@ -653,7 +664,7 @@ stages:
         strategy:
           matrix:
             linux_python36:
-              imageName: 'ubuntu-16.04'
+              imageName: ${{ parameters.ImageName }}
               python.version: '3.6'
               bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
               TEST_TMPDIR: $(Agent.TempDirectory)
@@ -705,7 +716,7 @@ stages:
         strategy:
           matrix:
             linux_python36:
-              imageName: 'ubuntu-16.04'
+              imageName: ${{ parameters.ImageName }}
               python.version: '3.6'
               bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
               TEST_TMPDIR: $(Agent.TempDirectory)
diff --git a/pip.conf b/pip.conf
index 6cd4bbcbc537..1871bc4afae4 100644
--- a/pip.conf
+++ b/pip.conf
@@ -1,3 +1,2 @@
 [global]
-extra-index-url=https://bizair.pkgs.visualstudio.com/_packaging/socrates-feed/pypi/simple/
-                https://bizair.pkgs.visualstudio.com/ccf3fa37-3b57-498c-8b43-231e00d92672/_packaging/ray-feed/pypi/simple/
+index-url=https://bizair.pkgs.visualstudio.com/_packaging/socrates-feed/pypi/simple/
\ No newline at end of file