diff --git a/CI/Azure-DevOps/AZ_MainPipeline.yml b/CI/Azure-DevOps/AZ_MainPipeline.yml
index 9e62f375e..9c5c41b94 100644
--- a/CI/Azure-DevOps/AZ_MainPipeline.yml
+++ b/CI/Azure-DevOps/AZ_MainPipeline.yml
@@ -102,7 +102,7 @@ stages:
 
     - task: AzureKeyVault@1
       inputs:
-        azureSubscription: 'Azure DevOps Main Pipeline Service Principal'
+        azureSubscription: 'tSQLt CI - Main Pipeline - Service Connection'
         KeyVaultName: 'tSQLtSigningKey'
         SecretsFilter: '*'
         RunAsPreJob: false
@@ -130,7 +130,7 @@ stages:
         SQLPORTMINIMUM: $(SqlPortMinimum)
         SQLPORTMAXIMUM: $(SqlPortMaximum)
       inputs:
-        azureSubscription: 'Azure DevOps Main Pipeline Service Principal'
+        azureSubscription: 'tSQLt CI - Main Pipeline - Service Connection'
         azurePowerShellVersion: 'LatestVersion'
         scriptType: ps
         scriptLocation: inlineScript
@@ -218,7 +218,7 @@ stages:
 
     - task: AzureKeyVault@1
       inputs:
-        azureSubscription: 'Azure DevOps Main Pipeline Service Principal'
+        azureSubscription: 'tSQLt CI - Main Pipeline - Service Connection'
         KeyVaultName: 'tSQLtSigningKey'
 
     - task: PowerShell@2
@@ -426,7 +426,7 @@ stages:
 
     - task: AzureKeyVault@1
       inputs:
-        azureSubscription: 'Azure DevOps Main Pipeline Service Principal'
+        azureSubscription: 'tSQLt CI - Main Pipeline - Service Connection'
         KeyVaultName: 'tSQLtSigningKey'
 
     - task: PowerShell@2
@@ -665,7 +665,7 @@ stages:
     - task: AzureCLI@2
       name: DeleteAzureVM
       inputs:
-        azureSubscription: 'Azure DevOps Main Pipeline Service Principal'
+        azureSubscription: 'tSQLt CI - Main Pipeline - Service Connection'
         azurePowerShellVersion: 'LatestVersion'
         scriptType: ps
         scriptLocation: inlineScript
diff --git a/CI/Azure-DevOps/AZ_NightlyCleanup.yml b/CI/Azure-DevOps/AZ_NightlyCleanup.yml
index b88be5c78..c06eb4e90 100644
--- a/CI/Azure-DevOps/AZ_NightlyCleanup.yml
+++ b/CI/Azure-DevOps/AZ_NightlyCleanup.yml
@@ -4,7 +4,7 @@
 # https://aka.ms/yaml
 
 pool:
-  vmImage: 'vs2017-win2016'
+  vmImage: 'windows-latest' #requires windows for azure authentication
 
 schedules:
   - cron: 1 16 * * *
@@ -35,11 +35,10 @@ steps:
     AZURE_DEVOPS_EXT_PAT: $(tSQLtCIAzureCLIPatToken) 
     ## black magic: this token ^^^^ is required to make "az pipelines runs show" work below
   inputs:
-    azureSubscription: 'tSQLt CI Subscription(58c04a99-5b92-410c-9e41-10262f68ca80)'
+    azureSubscription: 'tSQLt CI - Nightly Cleanup - Service Connection'
     scriptType: 'ps'
     scriptLocation: 'inlineScript'
     inlineScript: |
-      
       ##Functions
       $GetAll_tSQLtCI_RGs = {
         param();
@@ -141,7 +140,7 @@ steps:
 - task: AzurePowerShell@4
   name: print_stuff
   inputs:
-    azureSubscription: 'tSQLt CI Subscription(58c04a99-5b92-410c-9e41-10262f68ca80)'
+    azureSubscription: 'tSQLt CI - Nightly Cleanup - Service Connection'
     azurePowerShellVersion: 'LatestVersion'
     failOnStandardError: True
     ScriptType: 'InlineScript'
@@ -159,7 +158,7 @@ steps:
   condition: succeeded()
   name: Delete_RGs
   inputs:
-    azureSubscription: 'tSQLt CI Subscription(58c04a99-5b92-410c-9e41-10262f68ca80)'
+    azureSubscription: 'tSQLt CI - Nightly Cleanup - Service Connection'
     azurePowerShellVersion: 'LatestVersion'
     FailOnStandardError: true
     ScriptType: 'InlineScript'
@@ -225,7 +224,7 @@ steps:
   name: AssertDeleteSuccessful
   condition: always()
   inputs:
-    azureSubscription: 'tSQLt CI Subscription(58c04a99-5b92-410c-9e41-10262f68ca80)'
+    azureSubscription: 'tSQLt CI - Nightly Cleanup - Service Connection'
     azurePowerShellVersion: 'LatestVersion'
     failOnStandardError: True
     ScriptType: 'InlineScript'