diff --git a/templates/core/resource_api.py.jinja b/templates/core/resource_api.py.jinja
index ff19754..d67144e 100644
--- a/templates/core/resource_api.py.jinja
+++ b/templates/core/resource_api.py.jinja
@@ -7,7 +7,7 @@ from ansible_base.resource_registry.registry import (
     ServiceAPIConfig,
     SharedResource,
 )
-from ansible_base.resource_registry.shared_types import FeatureFlagType, UserType
+from ansible_base.resource_registry.shared_types import FeatureFlagType, OrganizationType, TeamType, UserType
 
 from apps.core.models import Organization, Team, User
 
@@ -22,15 +22,15 @@ RESOURCE_LIST = [
     ResourceConfig(
         Organization,
         shared_resource=SharedResource(
-            serializer=None,
-            is_provider=True,
+            serializer=OrganizationType,
+            is_provider=False,
         ),
     ),
     ResourceConfig(
         Team,
         shared_resource=SharedResource(
-            serializer=None,
-            is_provider=True,
+            serializer=TeamType,
+            is_provider=False,
         ),
         parent_resources=[
             ParentResource(model=Organization, field_name="organization"),