diff --git a/src/Metadata/Extractor/YamlResourceExtractor.php b/src/Metadata/Extractor/YamlResourceExtractor.php
index 841dbc3033f..a0afdcea2e8 100644
--- a/src/Metadata/Extractor/YamlResourceExtractor.php
+++ b/src/Metadata/Extractor/YamlResourceExtractor.php
@@ -75,6 +75,7 @@ private function buildResources(array $resourcesYaml, string $path): void
                 $resourceYaml = [$resourceYaml];
             }
 
+            $resourcesCount = isset($this->resources[$resourceName]) ? count($this->resources[$resourceName]) : 0;
             foreach ($resourceYaml as $key => $resourceYamlDatum) {
                 if (null === $resourceYamlDatum) {
                     $resourceYamlDatum = [];
@@ -82,7 +83,7 @@ private function buildResources(array $resourcesYaml, string $path): void
 
                 try {
                     $base = $this->buildExtendedBase($resourceYamlDatum);
-                    $this->resources[$resourceName][$key] = array_merge($base, [
+                    $this->resources[$resourceName][$resourcesCount+$key] = array_merge($base, [
                         'operations' => $this->buildOperations($resourceYamlDatum, $base),
                         'graphQlOperations' => $this->buildGraphQlOperations($resourceYamlDatum, $base),
                     ]);
diff --git a/src/Metadata/Resource/Factory/ExtractorResourceMetadataCollectionFactory.php b/src/Metadata/Resource/Factory/ExtractorResourceMetadataCollectionFactory.php
index e15764ff642..235090287b6 100644
--- a/src/Metadata/Resource/Factory/ExtractorResourceMetadataCollectionFactory.php
+++ b/src/Metadata/Resource/Factory/ExtractorResourceMetadataCollectionFactory.php
@@ -60,7 +60,7 @@ public function create(string $resourceClass): ResourceMetadataCollection
                 }
             }
 
-            $resourceMetadataCollection[$i] = $resource;
+            $resourceMetadataCollection[] = $resource;
         }
 
         return $resourceMetadataCollection;