diff --git a/opensearch-observability/build.gradle b/opensearch-observability/build.gradle
index 10511c057..f15fde73d 100644
--- a/opensearch-observability/build.gradle
+++ b/opensearch-observability/build.gradle
@@ -276,7 +276,7 @@ testClusters.integTest {
 
 String bwcVersion = "1.2.0-SNAPSHOT"
 String baseName = "obsBwcCluster"
-String bwcFilePath = "src/test/kotlin/org/opensearch/observability/resources/bwc/"
+String bwcFilePath = "src/test/resources/bwc/"
 
 2.times {i ->
     testClusters {
@@ -290,7 +290,7 @@ String bwcFilePath = "src/test/kotlin/org/opensearch/observability/resources/bwc
                     return new RegularFile() {
                         @Override
                         File getAsFile() {
-                            return fileTree(bwcFilePath + bwcVersion).getSingleFile()
+                            return fileTree(bwcFilePath + "observability/" + bwcVersion).getSingleFile()
                         }
                     }
                 }
@@ -308,6 +308,17 @@ task prepareBwcTests {
     dependsOn bundle
     doLast {
         plugins = [
+                provider(new Callable<RegularFile>(){
+                    @Override
+                    RegularFile call() throws Exception {
+                        return new RegularFile() {
+                            @Override
+                            File getAsFile() {
+                                return fileTree(bwcFilePath + "job-scheduler/" + project.version).getSingleFile()
+                            }
+                        }
+                    }
+                }),
                 project.getObjects().fileProperty().value(bundle.getArchiveFile())
         ]
     }
diff --git a/opensearch-observability/src/test/resources/bwc/job-scheduler/2.0.0.0-SNAPSHOT/opensearch-job-scheduler-2.0.0.0-SNAPSHOT.zip b/opensearch-observability/src/test/resources/bwc/job-scheduler/2.0.0.0-SNAPSHOT/opensearch-job-scheduler-2.0.0.0-SNAPSHOT.zip
new file mode 100644
index 000000000..7a026a76a
Binary files /dev/null and b/opensearch-observability/src/test/resources/bwc/job-scheduler/2.0.0.0-SNAPSHOT/opensearch-job-scheduler-2.0.0.0-SNAPSHOT.zip differ
diff --git a/opensearch-observability/src/test/kotlin/org/opensearch/observability/resources/bwc/1.1.0-SNAPSHOT/opensearch-notebooks-1.1.0.0-SNAPSHOT.zip b/opensearch-observability/src/test/resources/bwc/observability/1.1.0-SNAPSHOT/opensearch-notebooks-1.1.0.0-SNAPSHOT.zip
similarity index 100%
rename from opensearch-observability/src/test/kotlin/org/opensearch/observability/resources/bwc/1.1.0-SNAPSHOT/opensearch-notebooks-1.1.0.0-SNAPSHOT.zip
rename to opensearch-observability/src/test/resources/bwc/observability/1.1.0-SNAPSHOT/opensearch-notebooks-1.1.0.0-SNAPSHOT.zip
diff --git a/opensearch-observability/src/test/kotlin/org/opensearch/observability/resources/bwc/1.2.0-SNAPSHOT/opensearch-observability-1.2.0.0-SNAPSHOT.zip b/opensearch-observability/src/test/resources/bwc/observability/1.2.0-SNAPSHOT/opensearch-observability-1.2.0.0-SNAPSHOT.zip
similarity index 100%
rename from opensearch-observability/src/test/kotlin/org/opensearch/observability/resources/bwc/1.2.0-SNAPSHOT/opensearch-observability-1.2.0.0-SNAPSHOT.zip
rename to opensearch-observability/src/test/resources/bwc/observability/1.2.0-SNAPSHOT/opensearch-observability-1.2.0.0-SNAPSHOT.zip