diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs
index b3a7246aa..124982e3a 100644
--- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs
+++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs
@@ -13,8 +13,10 @@
             public void Apply(Operation operation, OperationFilterContext context)
             {
                 // Check for authorize attribute
-                var hasAuthorize = context.ApiDescription.ControllerAttributes().OfType<AuthorizeAttribute>().Any() ||
-                                   context.ApiDescription.ActionAttributes().OfType<AuthorizeAttribute>().Any();
+                var hasAuthorize = context.MethodInfo.DeclaringType.GetCustomAttributes(true)
+                                      .Union(context.MethodInfo.GetCustomAttributes(true))
+                                      .OfType<AuthorizeAttribute>()
+                                      .Any();
 
                 if (hasAuthorize)
                 {
diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs
index 3f382e5df..1665b38db 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs
@@ -13,8 +13,10 @@
             public void Apply(Operation operation, OperationFilterContext context)
             {
                 // Check for authorize attribute
-                var hasAuthorize = context.ApiDescription.ControllerAttributes().OfType<AuthorizeAttribute>().Any() ||
-                                   context.ApiDescription.ActionAttributes().OfType<AuthorizeAttribute>().Any();
+                var hasAuthorize = context.MethodInfo.DeclaringType.GetCustomAttributes(true)
+                                      .Union(context.MethodInfo.GetCustomAttributes(true))
+                                      .OfType<AuthorizeAttribute>()
+                                      .Any();
 
                 if (hasAuthorize)
                 {
diff --git a/src/Services/Basket/Basket.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs b/src/Services/Basket/Basket.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs
index f1c7b08d0..8142980e4 100644
--- a/src/Services/Basket/Basket.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs
+++ b/src/Services/Basket/Basket.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs
@@ -11,8 +11,10 @@ namespace Basket.API.Infrastructure.Filters
         public void Apply(Operation operation, OperationFilterContext context)
         {
             // Check for authorize attribute
-            var hasAuthorize = context.ApiDescription.ControllerAttributes().OfType<AuthorizeAttribute>().Any() ||
-                               context.ApiDescription.ActionAttributes().OfType<AuthorizeAttribute>().Any();
+            var hasAuthorize = context.MethodInfo.DeclaringType.GetCustomAttributes(true)
+                                      .Union(context.MethodInfo.GetCustomAttributes(true))
+                                      .OfType<AuthorizeAttribute>()
+                                      .Any();
 
             if (hasAuthorize)
             {
diff --git a/src/Services/Location/Locations.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs b/src/Services/Location/Locations.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs
index 8eccc83cf..b67a259ca 100644
--- a/src/Services/Location/Locations.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs
+++ b/src/Services/Location/Locations.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs
@@ -12,8 +12,10 @@ namespace Microsoft.eShopOnContainers.Services.Locations.API.Infrastructure.Filt
         public void Apply(Operation operation, OperationFilterContext context)
         {
             // Check for authorize attribute
-            var hasAuthorize = context.ApiDescription.ControllerAttributes().OfType<AuthorizeAttribute>().Any() ||
-                               context.ApiDescription.ActionAttributes().OfType<AuthorizeAttribute>().Any();
+            var hasAuthorize = context.MethodInfo.DeclaringType.GetCustomAttributes(true)
+                                      .Union(context.MethodInfo.GetCustomAttributes(true))
+                                      .OfType<AuthorizeAttribute>()
+                                      .Any();
 
             if (hasAuthorize)
             {
diff --git a/src/Services/Marketing/Marketing.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs b/src/Services/Marketing/Marketing.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs
index 2b4e15188..d69622728 100644
--- a/src/Services/Marketing/Marketing.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs
+++ b/src/Services/Marketing/Marketing.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs
@@ -11,8 +11,10 @@ namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.Filt
         public void Apply(Operation operation, OperationFilterContext context)
         {
             // Check for authorize attribute
-            var hasAuthorize = context.ApiDescription.ControllerAttributes().OfType<AuthorizeAttribute>().Any() ||
-                               context.ApiDescription.ActionAttributes().OfType<AuthorizeAttribute>().Any();
+            var hasAuthorize = context.MethodInfo.DeclaringType.GetCustomAttributes(true)
+                                      .Union(context.MethodInfo.GetCustomAttributes(true))
+                                      .OfType<AuthorizeAttribute>()
+                                      .Any();
 
             if (hasAuthorize)
             {
diff --git a/src/Services/Ordering/Ordering.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs b/src/Services/Ordering/Ordering.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs
index 3b569e0ba..fcef0bfe9 100644
--- a/src/Services/Ordering/Ordering.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs
+++ b/src/Services/Ordering/Ordering.API/Infrastructure/Filters/AuthorizeCheckOperationFilter.cs
@@ -13,8 +13,10 @@ namespace Ordering.API.Infrastructure.Filters
         public void Apply(Operation operation, OperationFilterContext context)
         {
             // Check for authorize attribute
-            var hasAuthorize = context.ApiDescription.ControllerAttributes().OfType<AuthorizeAttribute>().Any() ||
-                               context.ApiDescription.ActionAttributes().OfType<AuthorizeAttribute>().Any();
+            var hasAuthorize = context.MethodInfo.DeclaringType.GetCustomAttributes(true)
+                                      .Union(context.MethodInfo.GetCustomAttributes(true))
+                                      .OfType<AuthorizeAttribute>()
+                                      .Any();
 
             if (hasAuthorize)
             {
diff --git a/src/Services/Webhooks/Webhooks.API/Infrastructure/AuthorizeCheckOperationFilter.cs b/src/Services/Webhooks/Webhooks.API/Infrastructure/AuthorizeCheckOperationFilter.cs
index 9de9ee139..2b1760048 100644
--- a/src/Services/Webhooks/Webhooks.API/Infrastructure/AuthorizeCheckOperationFilter.cs
+++ b/src/Services/Webhooks/Webhooks.API/Infrastructure/AuthorizeCheckOperationFilter.cs
@@ -13,8 +13,10 @@ namespace Webhooks.API.Infrastructure
         public void Apply(Operation operation, OperationFilterContext context)
         {
             // Check for authorize attribute
-            var hasAuthorize = context.ApiDescription.ControllerAttributes().OfType<AuthorizeAttribute>().Any() ||
-                               context.ApiDescription.ActionAttributes().OfType<AuthorizeAttribute>().Any();
+            var hasAuthorize = context.MethodInfo.DeclaringType.GetCustomAttributes(true)
+                                      .Union(context.MethodInfo.GetCustomAttributes(true))
+                                      .OfType<AuthorizeAttribute>()
+                                      .Any();
 
             if (hasAuthorize)
             {