diff --git a/blueos_repository/extension/extension.py b/blueos_repository/extension/extension.py
index 68f1d6d1..f03612b1 100644
--- a/blueos_repository/extension/extension.py
+++ b/blueos_repository/extension/extension.py
@@ -157,8 +157,8 @@ async def __create_version_from_tag_blob(self, version_tag: Tag, blob: Blob) ->
         links = json5.loads(labels.get("links", "{}"))
         filter_tags = json5.loads(labels.get("tags", "[]"))
 
-        docs_raw = links.pop("docs", links.pop("documentation", labels.get("docs", None)))
-        company_raw = labels.get("company", None)
+        docs_link = links.pop("docs", links.pop("documentation", labels.get("docs", None)))
+        company_raw = labels.get("company", labels.get("maintainer", None))
         permissions_raw = labels.get("permissions", None)
 
         readme = labels.get("readme", None)
@@ -194,7 +194,7 @@ async def __create_version_from_tag_blob(self, version_tag: Tag, blob: Blob) ->
             extra_links=links,
             authors=json5.loads(authors),
             filter_tags=ExtensionVersion.validate_filter_tags(filter_tags),
-            docs=json5.loads(docs_raw) if docs_raw else None,
+            docs=docs_link,
             company=json5.loads(company_raw) if company_raw else None,
             permissions=json5.loads(permissions_raw) if permissions_raw else None,
             images=self.__extract_images_from_tag(version_tag),