diff --git a/.ci/packer_cache.sh b/.ci/packer_cache.sh
index 4533213920c3a..adc4f80d4960d 100755
--- a/.ci/packer_cache.sh
+++ b/.ci/packer_cache.sh
@@ -22,3 +22,4 @@ export JAVA8_HOME="${HOME}"/.java/java8
 export JAVA11_HOME="${HOME}"/.java/java11
 export JAVA12_HOME="${HOME}"/.java/openjdk12
 ./gradlew --parallel clean --scan -Porg.elasticsearch.acceptScanTOS=true -s resolveAllDependencies
+
diff --git a/distribution/bwc/build.gradle b/distribution/bwc/build.gradle
index 87644fb7f6785..1a4e4161418ab 100644
--- a/distribution/bwc/build.gradle
+++ b/distribution/bwc/build.gradle
@@ -239,12 +239,15 @@ bwcVersions.forPreviousUnreleased { BwcVersions.UnreleasedVersionInfo unreleased
                 
         createBuildBwcTask(projectName, "${baseDir}/${projectName}", projectArtifact)
     }
-    
 
     createRunBwcGradleTask("resolveAllBwcDependencies") {
         args 'resolveAllDependencies'
     }
-    resolveAllDependencies.dependsOn resolveAllBwcDependencies
+    Version currentVersion = Version.fromString(version)
+    if (currentVersion.getMinor() == 0 && currentVersion.getRevision() == 0) {
+        // We only want to resolve dependencies for live versions of master, without cascading this to older versions
+        resolveAllDependencies.dependsOn resolveAllBwcDependencies
+    }
 
     for (e in artifactFiles) {
         String projectName = e.key