diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 131fc15ff02..fc10bdc4e87 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -26,120 +26,62 @@ updates:
     labels: [ "changelog:dependencies" ]
 
   - package-ecosystem: "github-actions"
-    directory: "/"
     schedule:
       interval: "weekly"
     labels: [ "changelog:dependencies" ]
 
   - package-ecosystem: docker
-    directory: /
-    schedule:
-      interval: daily
-
-  - package-ecosystem: docker
-    directory: /cmd/agent
-    schedule:
-      interval: daily
-
-  - package-ecosystem: docker
-    directory: /cmd/all-in-one
-    schedule:
-      interval: daily
-
-  - package-ecosystem: docker
-    directory: /cmd/anonymizer
-    schedule:
-      interval: daily
-
-  - package-ecosystem: docker
-    directory: /cmd/collector
-    schedule:
-      interval: daily
-
-  - package-ecosystem: docker
-    directory: /cmd/es-index-cleaner
-    schedule:
-      interval: daily
-
-  - package-ecosystem: docker
-    directory: /cmd/es-rollover
-    schedule:
-      interval: daily
-
-  - package-ecosystem: docker
-    directory: /cmd/ingester
-    schedule:
-      interval: daily
-
-  - package-ecosystem: docker
-    directory: /cmd/jaeger
-    schedule:
-      interval: daily
-
-  - package-ecosystem: docker
-    directory: /cmd/query
-    schedule:
-      interval: daily
-
-  - package-ecosystem: docker
-    directory: /cmd/remote-storage
-    schedule:
-      interval: daily
-
-  - package-ecosystem: docker
-    directory: /cmd/tracegen
-    schedule:
-      interval: daily
-
-  - package-ecosystem: docker
-    directory: /crossdock
-    schedule:
-      interval: daily
-
-  - package-ecosystem: docker
-    directory: /docker/base
-    schedule:
-      interval: daily
-
-  - package-ecosystem: docker
-    directory: /docker/debug
-    schedule:
-      interval: daily
-
-  - package-ecosystem: docker
-    directory: /examples/hotrod
-    schedule:
-      interval: daily
-
-  - package-ecosystem: docker
-    directory: /plugin/storage/cassandra
+    directories:
+      - "/"
+      - /cmd/agent
+      - /cmd/all-in-one
+      - /cmd/anonymizer
+      - /cmd/collector
+      - /cmd/es-index-cleaner
+      - /cmd/es-rollover
+      - /cmd/ingester
+      - /cmd/jaeger
+      - /cmd/query
+      - /cmd/remote-storage
+      - /cmd/tracegen
+      - /crossdock
+      - /docker/base
+      - /docker/debug
+      - /examples/hotrod
+      - /plugin/storage/cassandra
     schedule:
       interval: daily
   - package-ecosystem: docker
-    directory: /docker-compose/elasticsearch
+    directories: 
+      - /docker-compose/elasticsearch/v7
+      - /docker-compose/elasticsearch/v8
     schedule:
       interval: daily
     allow:
       - dependency-name: "docker.elastic.co/elasticsearch/elasticsearch"
-        update-types: ["version-update:semver-minor"]
+        update-types: [ "version-update:semver-minor" ]
   - package-ecosystem: docker
-    directory: /docker-compose/opensearch
+    directories: 
+      - /docker-compose/opensearch/v1
+      - /docker-compose/opensearch/v2
     schedule:
       interval: daily
     allow:
       - dependency-name: "docker.elastic.co/opensearch/opensearch"
-        update-types: ["version-update:semver-minor"]
+        update-types: [ "version-update:semver-minor" ]
   - package-ecosystem: docker
     directory: /docker-compose/kafka-integration-test
     schedule:
       interval: daily
     allow:
       - dependency-name: "bitnami/kafka"
-        update-types: ["version-update:semver-minor"]
+        update-types: [ "version-update:semver-minor" ]
   - package-ecosystem: docker
-    directory: /docker-compose/cassandra
+    directories: 
+      - /docker-compose/cassandra/v3
+      - /docker-compose/cassandra/v4
     schedule:
       interval: daily
     allow:
       - dependency-name: "cassandra"
-        update-types: ["version-update:semver-minor"]
+        update-types: [ "version-update:semver-minor" ]
\ No newline at end of file
diff --git a/docker-compose/cassandra/v3.yaml b/docker-compose/cassandra/v3/docker-compose.yaml
similarity index 100%
rename from docker-compose/cassandra/v3.yaml
rename to docker-compose/cassandra/v3/docker-compose.yaml
diff --git a/docker-compose/cassandra/v4.yaml b/docker-compose/cassandra/v4/docker-compose.yaml
similarity index 100%
rename from docker-compose/cassandra/v4.yaml
rename to docker-compose/cassandra/v4/docker-compose.yaml
diff --git a/docker-compose/elasticsearch/v7.yml b/docker-compose/elasticsearch/v7/docker-compose.yml
similarity index 100%
rename from docker-compose/elasticsearch/v7.yml
rename to docker-compose/elasticsearch/v7/docker-compose.yml
diff --git a/docker-compose/elasticsearch/v8.yml b/docker-compose/elasticsearch/v8/docker-compose.yml
similarity index 100%
rename from docker-compose/elasticsearch/v8.yml
rename to docker-compose/elasticsearch/v8/docker-compose.yml
diff --git a/docker-compose/kafka-integration-test/v3.yml b/docker-compose/kafka-integration-test/docker-compose.yml
similarity index 100%
rename from docker-compose/kafka-integration-test/v3.yml
rename to docker-compose/kafka-integration-test/docker-compose.yml
diff --git a/docker-compose/opensearch/v1.yml b/docker-compose/opensearch/v1/docker-compose.yml
similarity index 100%
rename from docker-compose/opensearch/v1.yml
rename to docker-compose/opensearch/v1/docker-compose.yml
diff --git a/docker-compose/opensearch/v2.yml b/docker-compose/opensearch/v2/docker-compose.yml
similarity index 100%
rename from docker-compose/opensearch/v2.yml
rename to docker-compose/opensearch/v2/docker-compose.yml
diff --git a/scripts/cassandra-integration-test.sh b/scripts/cassandra-integration-test.sh
index c02c2454363..0cd685d4c68 100755
--- a/scripts/cassandra-integration-test.sh
+++ b/scripts/cassandra-integration-test.sh
@@ -50,7 +50,7 @@ run_integration_test() {
   local jaegerVersion=$3
   local primaryKeyspace="jaeger_v1_dc1"
   local archiveKeyspace="jaeger_v1_dc1_archive"
-  local compose_file="docker-compose/cassandra/v$major_version.yaml"
+  local compose_file="docker-compose/cassandra/v$major_version/docker-compose.yaml"
 
   setup_cassandra "${compose_file}"
 
diff --git a/scripts/es-integration-test.sh b/scripts/es-integration-test.sh
index de192d9cf47..9b1ecf6e794 100755
--- a/scripts/es-integration-test.sh
+++ b/scripts/es-integration-test.sh
@@ -64,7 +64,7 @@ bring_up_storage() {
   local distro=$1
   local version=$2
   local major_version=${version%%.*}
-  local compose_file="docker-compose/${distro}/v${major_version}.yml"
+  local compose_file="docker-compose/${distro}/v${major_version}/docker-compose.yml"
 
   echo "starting ${distro} ${major_version}"
   for retry in 1 2 3
diff --git a/scripts/kafka-integration-test.sh b/scripts/kafka-integration-test.sh
index 43f7a47f16f..654baabedd3 100644
--- a/scripts/kafka-integration-test.sh
+++ b/scripts/kafka-integration-test.sh
@@ -3,7 +3,7 @@
 set -e
 
 export STORAGE=kafka
-compose_file="docker-compose/kafka-integration-test/v3.yml"
+compose_file="docker-compose/kafka-integration-test/docker-compose.yml"
 
 # Check if the -k parameter is provided and start Kafka if it was
 if [ "$1" == "-k" ]; then