diff --git a/distribution/docker/build.gradle b/distribution/docker/build.gradle
index 58840e9e594..f5d8048a062 100644
--- a/distribution/docker/build.gradle
+++ b/distribution/docker/build.gradle
@@ -155,6 +155,10 @@ opensearch_distributions {
 
 tasks.named("preProcessFixture").configure {
   dependsOn opensearch_distributions.docker
+  // always run the task, otherwise the folders won't be created
+  outputs.upToDateWhen { 
+    false 
+  }
   doLast {
     // tests expect to have an empty repo
     project.delete(
@@ -262,3 +266,7 @@ subprojects { Project subProject ->
     }
   }
 }
+
+tasks.named("composeUp").configure {
+  dependsOn preProcessFixture
+}
diff --git a/qa/remote-clusters/build.gradle b/qa/remote-clusters/build.gradle
index 850d7ff11f4..2f3cd9d2d89 100644
--- a/qa/remote-clusters/build.gradle
+++ b/qa/remote-clusters/build.gradle
@@ -51,8 +51,12 @@ opensearch_distributions {
   }
 }
 
-preProcessFixture {
+tasks.named("preProcessFixture").configure {
   dependsOn opensearch_distributions.docker
+  // always run the task, otherwise the folders won't be created
+  outputs.upToDateWhen { 
+    false 
+  }
   doLast {
     // tests expect to have an empty repo
     project.delete(
@@ -86,3 +90,7 @@ tasks.register("integTest", Test) {
 }
 
 tasks.named("check").configure { dependsOn "integTest" }
+
+tasks.named("composeUp").configure {
+  dependsOn preProcessFixture
+}