diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c4b974d020..d206694ebd 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -2,8 +2,9 @@ variables:
   ssh_file: '~/.ssh/gh_deploy_key.priv'
   isMaster: $[eq(variables['Build.SourceBranch'], 'refs/heads/master')]
   isDevelop: $[eq(variables['Build.SourceBranch'], 'refs/heads/develop')]
-  isEpic: $[or(contains(variables['Build.SourceBranch'], 'epic/'), contains(variables['System.PullRequest.SourceBranch'], 'epic/'))]
   isPullRequest: $[eq(variables['Build.Reason'], 'PullRequest')]
+  isEpicBranchOrPr: $[or(contains(variables['Build.SourceBranch'], 'epic/'), contains(variables['System.PullRequest.SourceBranch'], 'epic/'))]
+  isNewEsBranchOrPr: $[or(contains(variables['Build.SourceBranch'], 'newes/'), contains(variables['System.PullRequest.SourceBranch'], 'newes/'))]
   dependencyCheckCacheKey: $[format('dependency-check-v1-{0:yyyyMM}', pipeline.startTime)]
   dependencyCheckDataDir: '$(Pipeline.Workspace)/dependency-check-data/v1'
 
@@ -49,7 +50,7 @@ stages:
   - stage: ES_S3_UP
     displayName: 'Upload missing ROR ES dependencies'
     dependsOn: [ ]
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'Manual'))
+    condition: and(succeeded(), ne(variables['Build.Reason'], 'Manual'), eq(variables.isNewEsBranchOrPr, true))
     jobs:
       - job:
         steps:
@@ -66,7 +67,7 @@ stages:
   - stage: OPTIONAL_CHECKS
     displayName: 'Optional checks'
     dependsOn: [ ES_S3_UP ]
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'Manual'))
+    condition: and(in(dependencies.ES_S3_UP.result, 'Succeeded', 'Skipped'), ne(variables['Build.Reason'], 'Manual'))
     jobs:
       - job: CVE_CHECK
         steps:
@@ -115,7 +116,7 @@ stages:
   - stage: REQUIRED_CHECKS
     displayName: 'Required checks'
     dependsOn: [ ES_S3_UP ]
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'Manual'))
+    condition: and(in(dependencies.ES_S3_UP.result, 'Succeeded', 'Skipped'), ne(variables['Build.Reason'], 'Manual'))
     jobs:
       - job: 
         steps:
@@ -141,7 +142,7 @@ stages:
     dependsOn: [ ES_S3_UP ]
     condition:
       and(
-        succeeded(),
+        in(dependencies.ES_S3_UP.result, 'Succeeded', 'Skipped'),
         or(
           ne(variables['Build.Reason'], 'Manual'),
           and(eq(variables['Build.Reason'], 'Manual'), startsWith('${{ parameters.actionToPerform }}', 'run_all_tests'))
@@ -190,7 +191,7 @@ stages:
           and(
             succeeded(),
             or(
-              eq(variables.isEpic, true),
+              eq(variables.isEpicBranchOrPr, true),
               eq(variables.isDevelop, true),
               eq(variables.isMaster, true),
               and(eq(variables['Build.Reason'], 'Manual'), eq('${{ parameters.actionToPerform }}', 'run_all_tests_on_linux'))
@@ -237,7 +238,7 @@ stages:
           and(
             succeeded(),
             or(
-              eq(variables.isEpic, true),
+              eq(variables.isEpicBranchOrPr, true),
               eq(variables.isDevelop, true),
               eq(variables.isMaster, true),
               and(eq(variables['Build.Reason'], 'Manual'), eq('${{ parameters.actionToPerform }}', 'run_all_tests_on_linux'))
@@ -312,7 +313,7 @@ stages:
           and(
             succeeded(),
             or(
-              eq(variables.isEpic, true),
+              eq(variables.isEpicBranchOrPr, true),
               eq(variables.isDevelop, true),
               eq(variables.isMaster, true),
               and(eq(variables['Build.Reason'], 'Manual'), eq('${{ parameters.actionToPerform }}', 'run_all_tests_on_linux'))
@@ -377,7 +378,7 @@ stages:
         condition:
           and(
             succeeded(),
-            ne(variables.isEpic, true),
+            ne(variables.isEpicBranchOrPr, true),
             ne(variables.isDevelop, true),
             ne(variables.isMaster, true),
             not(and(eq(variables['Build.Reason'], 'Manual'), startsWith('${{ parameters.actionToPerform }}', 'run_all_tests')))
@@ -420,7 +421,7 @@ stages:
         condition:
           and(
             succeeded(),
-            ne(variables.isEpic, true),
+            ne(variables.isEpicBranchOrPr, true),
             ne(variables.isDevelop, true),
             ne(variables.isMaster, true),
             not(and(eq(variables['Build.Reason'], 'Manual'), startsWith('${{ parameters.actionToPerform }}', 'run_all_tests')))
@@ -467,7 +468,7 @@ stages:
         condition:
           and(
             succeeded(),
-            ne(variables.isEpic, true),
+            ne(variables.isEpicBranchOrPr, true),
             ne(variables.isDevelop, true),
             ne(variables.isMaster, true),
             not(and(eq(variables['Build.Reason'], 'Manual'), startsWith('${{ parameters.actionToPerform }}', 'run_all_tests')))
@@ -514,7 +515,7 @@ stages:
           and(
             succeeded(),
             or(
-              eq(variables.isEpic, true),
+              eq(variables.isEpicBranchOrPr, true),
               eq(variables.isDevelop, true),
               eq(variables.isMaster, true)
             ),
@@ -572,7 +573,7 @@ stages:
         condition:
           and(
             succeeded(),
-            ne(variables.isEpic, true),
+            ne(variables.isEpicBranchOrPr, true),
             ne(variables.isDevelop, true),
             ne(variables.isMaster, true),
             not(and(eq(variables['Build.Reason'], 'Manual'), startsWith('${{ parameters.actionToPerform }}', 'run_all_tests')))