diff --git a/infra/stack.py b/infra/stack.py
index 64699e8..78b225e 100644
--- a/infra/stack.py
+++ b/infra/stack.py
@@ -333,7 +333,7 @@ def add_programmatic_client(
         CfnOutput(
             self,
             f"cognito-sdk-{service_id}-secret",
-            export_name=f"{stack_name}-cognito-sdk-secret",
+            export_name=f"{stack_name}-{service_id}-cognito-sdk-secret",
             value=f"{stack_name}/{service_id}",
         )
 
@@ -376,7 +376,7 @@ def add_service_client(
         CfnOutput(
             self,
             f"cognito-app-{service_id}-secret",
-            export_name=f"{stack_name}-cognito-app-secret",
+            export_name=f"{stack_name}-{service_id}-cognito-app-secret",
             value=f"{stack_name}/{service_id}",
         )