diff --git a/shared/oci.go b/shared/oci.go
index 0e18170..f35785f 100644
--- a/shared/oci.go
+++ b/shared/oci.go
@@ -28,10 +28,11 @@ const (
 )
 
 type Resource struct {
-	Name    string
-	Version string
-	Data    string
-	Type    string
+	Name          string
+	Version       string
+	Data          string
+	Type          string
+	ExtraIdentity map[string]string
 }
 
 type ComponentRef struct {
@@ -66,8 +67,9 @@ func BlobResource(resource Resource) ComponentModification {
 		return compvers.SetResourceBlob(
 			&compdesc.ResourceMeta{
 				ElementMeta: compdesc.ElementMeta{
-					Name:    resource.Name,
-					Version: resource.Version,
+					Name:          resource.Name,
+					Version:       resource.Version,
+					ExtraIdentity: resource.ExtraIdentity,
 				},
 				Type:     resource.Type,
 				Relation: ocmmetav1.LocalRelation,
@@ -83,8 +85,9 @@ func ImageRefResource(ref string, resource Resource) ComponentModification {
 	return func(compvers ocm.ComponentVersionAccess) error {
 		return compvers.SetResource(&compdesc.ResourceMeta{
 			ElementMeta: compdesc.ElementMeta{
-				Name:    resource.Name,
-				Version: resource.Version,
+				Name:          resource.Name,
+				Version:       resource.Version,
+				ExtraIdentity: resource.ExtraIdentity,
 			},
 			Type:     resource.Type,
 			Relation: ocmmetav1.ExternalRelation,
diff --git a/shared/steps/setup/add_file_to_git_repository.go b/shared/steps/setup/add_file_to_git_repository.go
index f5393c8..7744905 100644
--- a/shared/steps/setup/add_file_to_git_repository.go
+++ b/shared/steps/setup/add_file_to_git_repository.go
@@ -44,7 +44,7 @@ func AddFilesToGitRepository(files ...File) features.Func {
 				Content: base64.StdEncoding.EncodeToString(data),
 			})
 			if err != nil {
-				t.Fatal(fmt.Errorf("failed to add file to repository: %w", err))
+				t.Fatal(fmt.Errorf("failed to add file to repository %s: %w", file, err))
 			}
 
 			t.Logf("successfully added %s to repository %s", file.DestFilepath, file.RepoName)
diff --git a/shared/steps/teardown/dump_repository_content.go b/shared/steps/teardown/dump_repository_content.go
index 21d56a3..d04e48f 100644
--- a/shared/steps/teardown/dump_repository_content.go
+++ b/shared/steps/teardown/dump_repository_content.go
@@ -21,7 +21,14 @@ func DumpRepositoryContent(owner, repo string) features.Func {
 			t.Fatal(fmt.Errorf("failed to create gitea client: %w", err))
 		}
 
-		r, _, err := gclient.GetTrees(owner, repo, "main", true)
+		r, _, err := gclient.GetTrees(owner, repo, gitea.ListTreeOptions{
+			ListOptions: gitea.ListOptions{
+				PageSize: 100,
+				Page:     0,
+			},
+			Ref:       "main",
+			Recursive: true,
+		})
 		if err != nil {
 			t.Fatal(fmt.Errorf("failed to find repo for %s/%s: %w", owner, repo, err))
 		}