diff --git a/app/devops/serializers/centurionaudit_featureflag.py b/app/devops/serializers/centurionaudit_featureflag.py
index 23ce7d3d3..c7b4e5d89 100644
--- a/app/devops/serializers/centurionaudit_featureflag.py
+++ b/app/devops/serializers/centurionaudit_featureflag.py
@@ -14,7 +14,7 @@
 
 
 
-@extend_schema_serializer(component_name = 'FeatureFlagModelSerializer')
+@extend_schema_serializer(component_name = 'FeatureFlagAuditHistoryModelSerializer')
 class ModelSerializer(
     common.CommonModelSerializer,
     BaseSerializer
@@ -44,7 +44,7 @@ class Meta:
 
 
 
-@extend_schema_serializer(component_name = 'FeatureFlagViewSerializer')
+@extend_schema_serializer(component_name = 'FeatureFlagAuditHistoryViewSerializer')
 class ViewSerializer(
     ModelSerializer,
     AuditHistoryViewSerializer,
diff --git a/app/devops/serializers/centurionmodelnote_featureflag.py b/app/devops/serializers/centurionmodelnote_featureflag.py
index df7453fbf..c80478869 100644
--- a/app/devops/serializers/centurionmodelnote_featureflag.py
+++ b/app/devops/serializers/centurionmodelnote_featureflag.py
@@ -14,7 +14,7 @@
 
 
 
-@extend_schema_serializer(component_name = 'FeatureFlagModelSerializer')
+@extend_schema_serializer(component_name = 'FeatureFlagCenturionModelNoteModelSerializer')
 class ModelSerializer(
     BaseModelModelSerializer,
 ):
@@ -76,7 +76,7 @@ def validate(self, attrs):
         return is_valid
 
 
-@extend_schema_serializer(component_name = 'FeatureFlagViewSerializer')
+@extend_schema_serializer(component_name = 'FeatureFlagCenturionModelNoteViewSerializer')
 class ViewSerializer(
     ModelSerializer,
     BaseModelViewSerializer,
diff --git a/app/devops/serializers/feature_flag.py b/app/devops/serializers/feature_flag.py
index a045cd4f8..ab2d305a3 100644
--- a/app/devops/serializers/feature_flag.py
+++ b/app/devops/serializers/feature_flag.py
@@ -1,5 +1,7 @@
 from rest_framework import serializers
 
+from drf_spectacular.utils import extend_schema_serializer
+
 from access.serializers.organization import Organization, TenantBaseSerializer
 
 from api.serializers import common
@@ -37,6 +39,7 @@ def get_queryset(self):
 
 
 
+@extend_schema_serializer(component_name = 'FeatureFlagBaseSerializer')
 class BaseSerializer(serializers.ModelSerializer):
 
     display_name = serializers.SerializerMethodField('get_display_name')
@@ -67,6 +70,7 @@ class Meta:
         ]
 
 
+@extend_schema_serializer(component_name = 'FeatureFlagModelSerializer')
 class ModelSerializer(
     common.CommonModelSerializer,
     BaseSerializer
@@ -160,6 +164,7 @@ def is_valid(self, raise_exception = False):
 
 
 
+@extend_schema_serializer(component_name = 'FeatureFlagViewSerializer')
 class ViewSerializer(ModelSerializer):
 
     organization = TenantBaseSerializer( read_only = True )
diff --git a/app/devops/serializers/public_feature_flag.py b/app/devops/serializers/public_feature_flag.py
index 4521083ed..7fa3b46f7 100644
--- a/app/devops/serializers/public_feature_flag.py
+++ b/app/devops/serializers/public_feature_flag.py
@@ -1,9 +1,12 @@
 from rest_framework import serializers
 
+from drf_spectacular.utils import extend_schema_serializer
+
 from devops.models.feature_flag import FeatureFlag
 
 
 
+@extend_schema_serializer(component_name = 'PublicFeatureFlagViewSerializer')
 class ViewSerializer(
     serializers.ModelSerializer,
 ):
diff --git a/app/devops/serializers/software_enable_feature_flag.py b/app/devops/serializers/software_enable_feature_flag.py
index 965e500d6..9cf6a553f 100644
--- a/app/devops/serializers/software_enable_feature_flag.py
+++ b/app/devops/serializers/software_enable_feature_flag.py
@@ -1,5 +1,7 @@
 from rest_framework import serializers
 
+from drf_spectacular.utils import extend_schema_serializer
+
 from access.serializers.organization import TenantBaseSerializer
 
 from api.serializers import common
@@ -10,6 +12,7 @@
 
 
 
+@extend_schema_serializer(component_name = 'SoftwareEnableFeatureFlagBaseSerializer')
 class BaseSerializer(serializers.ModelSerializer):
 
     display_name = serializers.SerializerMethodField('get_display_name')
@@ -40,6 +43,7 @@ class Meta:
         ]
 
 
+@extend_schema_serializer(component_name = 'SoftwareEnableFeatureFlagModelSerializer')
 class ModelSerializer(
     common.CommonModelSerializer,
     BaseSerializer
@@ -92,6 +96,7 @@ def validate(self, attrs):
 
 
 
+@extend_schema_serializer(component_name = 'SoftwareEnableFeatureFlagViewSerializer')
 class ViewSerializer(ModelSerializer):
 
     organization = TenantBaseSerializer( read_only = True )