diff --git a/package.json b/package.json
index 1788266..7075583 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alliander-opensource/aws-jwt-sts",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "author": {
     "name": "Alliander NV"
   },
diff --git a/src/index.ts b/src/index.ts
index 2f846b5..b56f5b5 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -435,20 +435,20 @@ export class AwsJwtSts extends Construct {
       new cdk.CfnOutput(this, 'tokenEndpoint', {
         value: 'https://' + tokenDomainName + '/token',
         description: 'Url of the token endpoint',
-        exportName: 'tokenEndpoint'
+        exportName: `${cdk.Stack.of(this)}-tokenEndpoint`
       })
     } else {
       new cdk.CfnOutput(this, 'tokenEndpoint', {
         value: api.url + 'token',
         description: 'Url of the token endpoint',
-        exportName: 'tokenEndpoint'
+        exportName: `${cdk.Stack.of(this)}-tokenEndpoint`
       })
     }
 
     new cdk.CfnOutput(this, 'issuer', {
       value: issuer,
       description: 'Url of the issuer',
-      exportName: 'issuer'
+      exportName: `${cdk.Stack.of(this)}-issuer`
     })
 
     /** ---------------------- WAF ----------------------- */