diff --git a/src/lib/cloudflare/services/access/main.ts b/src/lib/cloudflare/services/access/main.ts
index c276abc0..b8d20756 100644
--- a/src/lib/cloudflare/services/access/main.ts
+++ b/src/lib/cloudflare/services/access/main.ts
@@ -1,4 +1,16 @@
-import * as cloudflare from '@pulumi/cloudflare'
+import {
+  AccessRule,
+  ZeroTrustAccessApplication,
+  ZeroTrustAccessCustomPage,
+  ZeroTrustAccessGroup,
+  ZeroTrustAccessIdentityProvider,
+  ZeroTrustAccessMtlsCertificate,
+  ZeroTrustAccessPolicy,
+  ZeroTrustAccessServiceToken,
+  ZeroTrustAccessShortLivedCertificate,
+  ZeroTrustAccessTag,
+  ZeroTrustOrganization,
+} from '@pulumi/cloudflare'
 import { CommonCloudflareConstruct } from '../../common/construct.js'
 import {
   AccessRuleProps,
@@ -47,12 +59,16 @@ export class CloudflareAccessManager {
           filter: { name: scope.props.domainName },
         })?.id
 
-    return new cloudflare.ZeroTrustAccessApplication(`${id}`, {
-      ...props,
-      domain: `${props.domain}-${scope.props.domainName}`,
-      name: `${props.name}-${scope.props.stage}`,
-      zoneId,
-    })
+    return new ZeroTrustAccessApplication(
+      `${id}`,
+      {
+        ...props,
+        domain: `${props.domain}-${scope.props.domainName}`,
+        name: `${props.name}-${scope.props.stage}`,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -75,10 +91,14 @@ export class CloudflareAccessManager {
           filter: { name: scope.props.domainName },
         })?.id
 
-    return new cloudflare.ZeroTrustAccessShortLivedCertificate(`${id}`, {
-      ...props,
-      zoneId,
-    })
+    return new ZeroTrustAccessShortLivedCertificate(
+      `${id}`,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -91,11 +111,15 @@ export class CloudflareAccessManager {
   public createAccessCustomPage(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessCustomPageProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    return new cloudflare.ZeroTrustAccessCustomPage(`${id}`, {
-      ...props,
-      accountId: props.accountId ?? scope.props.accountId,
-      name: `${props.name}-${scope.props.stage}`,
-    })
+    return new ZeroTrustAccessCustomPage(
+      `${id}`,
+      {
+        ...props,
+        accountId: props.accountId ?? scope.props.accountId,
+        name: `${props.name}-${scope.props.stage}`,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -114,11 +138,15 @@ export class CloudflareAccessManager {
           filter: { name: scope.props.domainName },
         })?.id
 
-    return new cloudflare.ZeroTrustAccessGroup(`${id}`, {
-      ...props,
-      name: `${props.name} - ${scope.props.stage.toUpperCase()}`,
-      zoneId,
-    })
+    return new ZeroTrustAccessGroup(
+      `${id}`,
+      {
+        ...props,
+        name: `${props.name} - ${scope.props.stage.toUpperCase()}`,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -141,12 +169,16 @@ export class CloudflareAccessManager {
           filter: { name: scope.props.domainName },
         })?.id
 
-    return new cloudflare.ZeroTrustAccessIdentityProvider(`${id}`, {
-      ...props,
-      config: props.config ?? {},
-      name: `${props.name}-${scope.props.stage}`,
-      zoneId,
-    })
+    return new ZeroTrustAccessIdentityProvider(
+      `${id}`,
+      {
+        ...props,
+        config: props.config ?? {},
+        name: `${props.name}-${scope.props.stage}`,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -169,11 +201,15 @@ export class CloudflareAccessManager {
           filter: { name: scope.props.domainName },
         })?.id
 
-    return new cloudflare.ZeroTrustAccessMtlsCertificate(`${id}`, {
-      ...props,
-      name: `${props.name}-${scope.props.stage}`,
-      zoneId,
-    })
+    return new ZeroTrustAccessMtlsCertificate(
+      `${id}`,
+      {
+        ...props,
+        name: `${props.name}-${scope.props.stage}`,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -192,11 +228,15 @@ export class CloudflareAccessManager {
           filter: { name: scope.props.domainName },
         })?.id
 
-    return new cloudflare.ZeroTrustOrganization(`${id}`, {
-      ...props,
-      name: `${props.name}-${scope.props.stage}`,
-      zoneId,
-    })
+    return new ZeroTrustOrganization(
+      `${id}`,
+      {
+        ...props,
+        name: `${props.name}-${scope.props.stage}`,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -209,11 +249,15 @@ export class CloudflareAccessManager {
   public createAccessPolicy(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessPolicyProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    return new cloudflare.ZeroTrustAccessPolicy(`${id}`, {
-      ...props,
-      name: `${props.name}-${scope.props.stage}`,
-      accountId: props.accountId ?? scope.props.accountId,
-    })
+    return new ZeroTrustAccessPolicy(
+      `${id}`,
+      {
+        ...props,
+        name: `${props.name}-${scope.props.stage}`,
+        accountId: props.accountId ?? scope.props.accountId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -232,11 +276,15 @@ export class CloudflareAccessManager {
           filter: { name: scope.props.domainName },
         })?.id
 
-    return new cloudflare.AccessRule(`${id}`, {
-      ...props,
-      zoneId,
-      accountId: props.accountId ?? scope.props.accountId,
-    })
+    return new AccessRule(
+      `${id}`,
+      {
+        ...props,
+        zoneId,
+        accountId: props.accountId ?? scope.props.accountId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -259,12 +307,16 @@ export class CloudflareAccessManager {
           filter: { name: scope.props.domainName },
         })?.id
 
-    return new cloudflare.ZeroTrustAccessServiceToken(`${id}`, {
-      ...props,
-      name: `${props.name}-${scope.props.stage}`,
-      accountId: props.accountId ?? scope.props.accountId,
-      zoneId,
-    })
+    return new ZeroTrustAccessServiceToken(
+      `${id}`,
+      {
+        ...props,
+        name: `${props.name}-${scope.props.stage}`,
+        accountId: props.accountId ?? scope.props.accountId,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -277,10 +329,14 @@ export class CloudflareAccessManager {
   public createAccessTag(id: string, scope: CommonCloudflareConstruct, props: ZeroTrustAccessTagProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    return new cloudflare.ZeroTrustAccessTag(`${id}`, {
-      ...props,
-      name: `${props.name}-${scope.props.stage}`,
-      accountId: props.accountId ?? scope.props.accountId,
-    })
+    return new ZeroTrustAccessTag(
+      `${id}`,
+      {
+        ...props,
+        name: `${props.name}-${scope.props.stage}`,
+        accountId: props.accountId ?? scope.props.accountId,
+      },
+      { parent: scope }
+    )
   }
 }
diff --git a/src/lib/cloudflare/services/api-shield/main.ts b/src/lib/cloudflare/services/api-shield/main.ts
index 02af1129..dc5965b9 100644
--- a/src/lib/cloudflare/services/api-shield/main.ts
+++ b/src/lib/cloudflare/services/api-shield/main.ts
@@ -1,4 +1,10 @@
-import * as cloudflare from '@pulumi/cloudflare'
+import {
+  ApiShield,
+  ApiShieldOperation,
+  ApiShieldOperationSchemaValidationSettings,
+  ApiShieldSchema,
+  ApiShieldSchemaValidationSettings,
+} from '@pulumi/cloudflare'
 import { CommonCloudflareConstruct } from '../../common/index.js'
 import {
   ApiShieldOperationProps,
@@ -39,10 +45,14 @@ export class CloudflareApiShieldManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    return new cloudflare.ApiShield(`${id}`, {
-      ...props,
-      zoneId,
-    })
+    return new ApiShield(
+      `${id}`,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -58,11 +68,15 @@ export class CloudflareApiShieldManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    return new cloudflare.ApiShieldSchema(`${id}`, {
-      ...props,
-      name: `${props.name}-${scope.props.stage}`,
-      zoneId,
-    })
+    return new ApiShieldSchema(
+      `${id}`,
+      {
+        ...props,
+        name: `${props.name}-${scope.props.stage}`,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -82,10 +96,14 @@ export class CloudflareApiShieldManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    return new cloudflare.ApiShieldSchemaValidationSettings(`${id}`, {
-      ...props,
-      zoneId,
-    })
+    return new ApiShieldSchemaValidationSettings(
+      `${id}`,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -101,10 +119,14 @@ export class CloudflareApiShieldManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    return new cloudflare.ApiShieldOperation(`${id}`, {
-      ...props,
-      zoneId,
-    })
+    return new ApiShieldOperation(
+      `${id}`,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -124,9 +146,13 @@ export class CloudflareApiShieldManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    return new cloudflare.ApiShieldOperationSchemaValidationSettings(`${id}`, {
-      ...props,
-      zoneId,
-    })
+    return new ApiShieldOperationSchemaValidationSettings(
+      `${id}`,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 }
diff --git a/src/lib/cloudflare/services/argo/main.ts b/src/lib/cloudflare/services/argo/main.ts
index 69713e99..95241218 100644
--- a/src/lib/cloudflare/services/argo/main.ts
+++ b/src/lib/cloudflare/services/argo/main.ts
@@ -1,4 +1,4 @@
-import * as cloudflare from '@pulumi/cloudflare'
+import { ArgoSmartRouting, ArgoTieredCaching } from '@pulumi/cloudflare'
 import { CommonCloudflareConstruct } from '../../common/index.js'
 import { ArgoSmartRoutingProps, ArgoTieredCachingProps } from './types.js'
 
@@ -33,10 +33,14 @@ export class CloudflareArgoManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    return new cloudflare.ArgoSmartRouting(`${id}`, {
-      ...props,
-      zoneId,
-    })
+    return new ArgoSmartRouting(
+      `${id}`,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -52,9 +56,13 @@ export class CloudflareArgoManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    return new cloudflare.ArgoTieredCaching(`${id}`, {
-      ...props,
-      zoneId,
-    })
+    return new ArgoTieredCaching(
+      `${id}`,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 }
diff --git a/src/lib/cloudflare/services/filter/main.ts b/src/lib/cloudflare/services/filter/main.ts
index ba7ee8b3..af526fec 100644
--- a/src/lib/cloudflare/services/filter/main.ts
+++ b/src/lib/cloudflare/services/filter/main.ts
@@ -1,4 +1,4 @@
-import * as cloudflare from '@pulumi/cloudflare'
+import { Filter } from '@pulumi/cloudflare'
 import { CommonCloudflareConstruct } from '../../common/index.js'
 import { FilterProps } from './types.js'
 
@@ -33,9 +33,13 @@ export class CloudflareFilterManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    return new cloudflare.Filter(`${id}`, {
-      ...props,
-      zoneId,
-    })
+    return new Filter(
+      `${id}`,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 }
diff --git a/src/lib/cloudflare/services/firewall/main.ts b/src/lib/cloudflare/services/firewall/main.ts
index b58d0642..3df0166b 100644
--- a/src/lib/cloudflare/services/firewall/main.ts
+++ b/src/lib/cloudflare/services/firewall/main.ts
@@ -1,4 +1,4 @@
-import * as cloudflare from '@pulumi/cloudflare'
+import { FirewallRule } from '@pulumi/cloudflare'
 import { CommonCloudflareConstruct } from '../../common/index.js'
 import { FirewallRuleProps } from './types.js'
 
@@ -33,9 +33,13 @@ export class CloudflareFirewallManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    return new cloudflare.FirewallRule(`${id}`, {
-      ...props,
-      zoneId,
-    })
+    return new FirewallRule(
+      `${id}`,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 }
diff --git a/src/lib/cloudflare/services/page/main.ts b/src/lib/cloudflare/services/page/main.ts
index 1a4d062a..a72eb272 100644
--- a/src/lib/cloudflare/services/page/main.ts
+++ b/src/lib/cloudflare/services/page/main.ts
@@ -1,4 +1,4 @@
-import * as cloudflare from '@pulumi/cloudflare'
+import { PageRule, PagesDomain, PagesProject } from '@pulumi/cloudflare'
 import { local } from '@pulumi/command'
 import { CommonCloudflareConstruct } from '../../common/index.js'
 import { PageRuleProps, PagesDomainProps, PagesProjectDeployProps, PagesProjectProps } from './types.js'
@@ -31,11 +31,15 @@ export class CloudflarePageManager {
   public createPagesProject(id: string, scope: CommonCloudflareConstruct, props: PagesProjectProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    return new cloudflare.PagesProject(`${id}`, {
-      ...props,
-      accountId: props.accountId ?? scope.props.accountId,
-      name: `${props.name}-${scope.props.stage}`,
-    })
+    return new PagesProject(
+      `${id}`,
+      {
+        ...props,
+        accountId: props.accountId ?? scope.props.accountId,
+        name: `${props.name}-${scope.props.stage}`,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -48,11 +52,15 @@ export class CloudflarePageManager {
   public createPagesDomain(id: string, scope: CommonCloudflareConstruct, props: PagesDomainProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    return new cloudflare.PagesDomain(`${id}`, {
-      ...props,
-      accountId: props.accountId ?? scope.props.accountId,
-      name: props.name ?? scope.props.domainName,
-    })
+    return new PagesDomain(
+      `${id}`,
+      {
+        ...props,
+        accountId: props.accountId ?? scope.props.accountId,
+        name: props.name ?? scope.props.domainName,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -68,10 +76,14 @@ export class CloudflarePageManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    return new cloudflare.PageRule(`${id}`, {
-      ...props,
-      zoneId,
-    })
+    return new PageRule(
+      `${id}`,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   public deployPagesProject(id: string, scope: CommonCloudflareConstruct, props: PagesProjectDeployProps) {
diff --git a/src/lib/cloudflare/services/record/main.ts b/src/lib/cloudflare/services/record/main.ts
index 3a3d3ba9..35463a01 100644
--- a/src/lib/cloudflare/services/record/main.ts
+++ b/src/lib/cloudflare/services/record/main.ts
@@ -1,4 +1,4 @@
-import * as cloudflare from '@pulumi/cloudflare'
+import { DnsRecord } from '@pulumi/cloudflare'
 import { CommonCloudflareConstruct } from '../../common/index.js'
 import { DnsRecordProps } from './types.js'
 
@@ -33,9 +33,13 @@ export class CloudflareRecordManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    return new cloudflare.DnsRecord(id, {
-      ...props,
-      zoneId,
-    })
+    return new DnsRecord(
+      id,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 }
diff --git a/src/lib/cloudflare/services/rule-set/main.ts b/src/lib/cloudflare/services/rule-set/main.ts
index fcd59040..b2860583 100644
--- a/src/lib/cloudflare/services/rule-set/main.ts
+++ b/src/lib/cloudflare/services/rule-set/main.ts
@@ -1,4 +1,4 @@
-import * as cloudflare from '@pulumi/cloudflare'
+import { Ruleset } from '@pulumi/cloudflare'
 import { CommonCloudflareConstruct } from '../../common/index.js'
 import { RulesetProps } from './types.js'
 
@@ -25,7 +25,7 @@ export class CloudflareRuleSetManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props rule set properties
-   * @see [Pulumi Cloudflare Ruleset]{@link https://www.pulumi.com/registry/packages/cloudflare/api-docs/ruleset/}
+   * @see [Pulumi Cloudflare Ruleset]{@link https://www.pulumi.com/registry/packages//api-docs/ruleset/}
    */
   public createRuleSet(id: string, scope: CommonCloudflareConstruct, props: RulesetProps) {
     if (!props) throw `Props undefined for ${id}`
@@ -33,11 +33,13 @@ export class CloudflareRuleSetManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    const ruleSet = new cloudflare.Ruleset(`${id}`, {
-      ...props,
-      zoneId,
-    })
-
-    return ruleSet
+    return new Ruleset(
+      `${id}`,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 }
diff --git a/src/lib/cloudflare/services/worker/main.ts b/src/lib/cloudflare/services/worker/main.ts
index 750f481c..7ab96582 100644
--- a/src/lib/cloudflare/services/worker/main.ts
+++ b/src/lib/cloudflare/services/worker/main.ts
@@ -1,4 +1,11 @@
-import * as cloudflare from '@pulumi/cloudflare'
+import {
+  WorkersCronTrigger,
+  WorkersCustomDomain,
+  WorkersKv,
+  WorkersKvNamespace,
+  WorkersRoute,
+  WorkersScript,
+} from '@pulumi/cloudflare'
 import { CommonCloudflareConstruct } from '../../common/index.js'
 import {
   WorkerCronTriggerProps,
@@ -40,11 +47,15 @@ export class CloudflareWorkerManager {
     const zoneId = props.zoneId
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
-    return new cloudflare.WorkersCustomDomain(id, {
-      ...props,
-      accountId: props.accountId ?? scope.props.accountId,
-      zoneId,
-    })
+    return new WorkersCustomDomain(
+      id,
+      {
+        ...props,
+        accountId: props.accountId ?? scope.props.accountId,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -61,11 +72,15 @@ export class CloudflareWorkerManager {
       ? props.zoneId
       : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })?.id
 
-    return new cloudflare.WorkersRoute(id, {
-      ...props,
-      script: `${props.script}-${scope.props.stage}`,
-      zoneId,
-    })
+    return new WorkersRoute(
+      id,
+      {
+        ...props,
+        script: `${props.script}-${scope.props.stage}`,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -78,11 +93,15 @@ export class CloudflareWorkerManager {
   public createWorkerScript(id: string, scope: CommonCloudflareConstruct, props: WorkerScriptProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    return new cloudflare.WorkersScript(id, {
-      ...props,
-      accountId: props.accountId ?? scope.props.accountId,
-      scriptName: `${props.scriptName}-${scope.props.stage}`,
-    })
+    return new WorkersScript(
+      id,
+      {
+        ...props,
+        accountId: props.accountId ?? scope.props.accountId,
+        scriptName: `${props.scriptName}-${scope.props.stage}`,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -95,11 +114,15 @@ export class CloudflareWorkerManager {
   public createWorkersKvNamespace(id: string, scope: CommonCloudflareConstruct, props: WorkersKvNamespaceProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    return new cloudflare.WorkersKvNamespace(id, {
-      ...props,
-      accountId: props.accountId ?? scope.props.accountId,
-      title: scope.isProductionStage() ? props.title : `${props.title}-${scope.props.stage}`,
-    })
+    return new WorkersKvNamespace(
+      id,
+      {
+        ...props,
+        accountId: props.accountId ?? scope.props.accountId,
+        title: scope.isProductionStage() ? props.title : `${props.title}-${scope.props.stage}`,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -112,10 +135,14 @@ export class CloudflareWorkerManager {
   public createWorkersKv(id: string, scope: CommonCloudflareConstruct, props: WorkersKvProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    return new cloudflare.WorkersKv(id, {
-      ...props,
-      accountId: props.accountId ?? scope.props.accountId,
-    })
+    return new WorkersKv(
+      id,
+      {
+        ...props,
+        accountId: props.accountId ?? scope.props.accountId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -128,9 +155,13 @@ export class CloudflareWorkerManager {
   public createWorkerCronTrigger(id: string, scope: CommonCloudflareConstruct, props: WorkerCronTriggerProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    return new cloudflare.WorkersCronTrigger(id, {
-      ...props,
-      accountId: props.accountId ?? scope.props.accountId,
-    })
+    return new WorkersCronTrigger(
+      id,
+      {
+        ...props,
+        accountId: props.accountId ?? scope.props.accountId,
+      },
+      { parent: scope }
+    )
   }
 }
diff --git a/src/lib/cloudflare/services/zone/main.ts b/src/lib/cloudflare/services/zone/main.ts
index 7c898d9c..1054110c 100644
--- a/src/lib/cloudflare/services/zone/main.ts
+++ b/src/lib/cloudflare/services/zone/main.ts
@@ -1,4 +1,12 @@
-import * as cloudflare from '@pulumi/cloudflare'
+import {
+  Zone,
+  ZoneCacheReserve,
+  ZoneCacheVariants,
+  ZoneDnssec,
+  ZoneHold,
+  ZoneLockdown,
+  ZoneSetting,
+} from '@pulumi/cloudflare'
 import * as pulumi from '@pulumi/pulumi'
 import { CommonCloudflareConstruct } from '../../common/index.js'
 import {
@@ -39,16 +47,20 @@ export class CloudflareZoneManager {
   public createZone(id: string, scope: CommonCloudflareConstruct, props: ZoneProps) {
     if (!props) throw `Props undefined for ${id}`
 
-    return new cloudflare.Zone(id, {
-      ...props,
-      account: props.account ?? scope.props.accountId,
-      name: scope.props.domainName,
-    })
+    return new Zone(
+      id,
+      {
+        ...props,
+        account: props.account ?? scope.props.accountId,
+        name: scope.props.domainName,
+      },
+      { parent: scope }
+    )
   }
 
   public resolveZone(id: string, scope: CommonCloudflareConstruct, options?: GetZoneProps) {
     const name = options?.filter?.name ?? scope.props.domainName
-    return cloudflare.Zone.get(name, id)
+    return Zone.get(name, id)
   }
 
   /**
@@ -63,10 +75,14 @@ export class CloudflareZoneManager {
     const zoneId =
       props.zoneId ??
       pulumi.output(this.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })).id
-    return new cloudflare.ZoneCacheReserve(id, {
-      ...props,
-      zoneId,
-    })
+    return new ZoneCacheReserve(
+      id,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -81,10 +97,14 @@ export class CloudflareZoneManager {
     const zoneId =
       props.zoneId ??
       pulumi.output(this.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })).id
-    return new cloudflare.ZoneCacheVariants(id, {
-      ...props,
-      zoneId,
-    })
+    return new ZoneCacheVariants(
+      id,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -99,10 +119,14 @@ export class CloudflareZoneManager {
     const zoneId =
       props.zoneId ??
       pulumi.output(this.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })).id
-    return new cloudflare.ZoneDnssec(id, {
-      ...props,
-      zoneId,
-    })
+    return new ZoneDnssec(
+      id,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -117,10 +141,14 @@ export class CloudflareZoneManager {
     const zoneId =
       props.zoneId ??
       pulumi.output(this.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })).id
-    return new cloudflare.ZoneHold(id, {
-      ...props,
-      zoneId,
-    })
+    return new ZoneHold(
+      id,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -135,10 +163,14 @@ export class CloudflareZoneManager {
     const zoneId =
       props.zoneId ??
       pulumi.output(this.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })).id
-    return new cloudflare.ZoneLockdown(id, {
-      ...props,
-      zoneId,
-    })
+    return new ZoneLockdown(
+      id,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 
   /**
@@ -153,10 +185,14 @@ export class CloudflareZoneManager {
     const zoneId =
       props.zoneId ??
       pulumi.output(this.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })).id
-    const zoneDnsSettings = new cloudflare.ZoneSetting(id, {
-      ...props,
-      zoneId,
-    })
+    const zoneDnsSettings = new ZoneSetting(
+      id,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
 
     return zoneDnsSettings
   }
@@ -173,9 +209,13 @@ export class CloudflareZoneManager {
     const zoneId =
       props.zoneId ??
       pulumi.output(this.resolveZone(`${id}-data-zone`, scope, { filter: { name: scope.props.domainName } })).id
-    return new cloudflare.ZoneSetting(id, {
-      ...props,
-      zoneId,
-    })
+    return new ZoneSetting(
+      id,
+      {
+        ...props,
+        zoneId,
+      },
+      { parent: scope }
+    )
   }
 }
diff --git a/src/test/cloudflare/common/common-cloudflare-construct.test.ts b/src/test/cloudflare/common/common-cloudflare-construct.test.ts
index cbabfb9b..0d66a388 100644
--- a/src/test/cloudflare/common/common-cloudflare-construct.test.ts
+++ b/src/test/cloudflare/common/common-cloudflare-construct.test.ts
@@ -72,7 +72,9 @@ describe('TestCloudflareCommonConstruct', () => {
       .all([stack.construct.zone.id, stack.construct.zone.urn, stack.construct.zone.name, stack.construct.zone.account])
       .apply(([id, urn, name, account]) => {
         expect(id).toEqual('test-zone-dev-id')
-        expect(urn).toEqual('urn:pulumi:stack::project::cloudflare:index/zone:Zone::test-zone-dev')
+        expect(urn).toEqual(
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev'
+        )
         expect(name).toEqual('gradientedge.io')
         expect(account.id).toEqual('test-account')
       })
@@ -91,7 +93,7 @@ describe('TestCloudflareCommonConstruct', () => {
       .apply(([id, urn, zoneId]) => {
         expect(id).toEqual('test-zone-cache-reserve-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/zoneCacheReserve:ZoneCacheReserve::test-zone-cache-reserve-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zoneCacheReserve:ZoneCacheReserve::test-zone-cache-reserve-dev'
         )
         expect(zoneId).toEqual('test-zone-dev-id')
       })
diff --git a/src/test/cloudflare/construct/pages-static-site.test.ts b/src/test/cloudflare/construct/pages-static-site.test.ts
index e471fc07..7aed8afd 100644
--- a/src/test/cloudflare/construct/pages-static-site.test.ts
+++ b/src/test/cloudflare/construct/pages-static-site.test.ts
@@ -100,7 +100,9 @@ describe('TestCloudflarePagesStaticSite', () => {
       ])
       .apply(([id, urn, name, account]) => {
         expect(id).toEqual('test-common-stack-zone-id')
-        expect(urn).toEqual('urn:pulumi:stack::project::cloudflare:index/zone:Zone::test-common-stack-zone')
+        expect(urn).toEqual(
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zone:Zone::test-common-stack-zone'
+        )
         expect(name).toEqual('gradientedge.io')
         expect(account.id).toEqual('test-account')
       })
@@ -121,7 +123,7 @@ describe('TestCloudflarePagesStaticSite', () => {
       .apply(([id, urn, accountId, name, productionBranch]) => {
         expect(id).toEqual('test-common-stack-site-project-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/pagesProject:PagesProject::test-common-stack-site-project'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/pagesProject:PagesProject::test-common-stack-site-project'
         )
         expect(accountId).toEqual('123456789012')
         expect(name).toEqual('test-simple-project-dev')
@@ -144,7 +146,7 @@ describe('TestCloudflarePagesStaticSite', () => {
       .apply(([id, urn, accountId, name, projectName]) => {
         expect(id).toEqual('test-common-stack-site-domain-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/pagesDomain:PagesDomain::test-common-stack-site-domain'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/pagesDomain:PagesDomain::test-common-stack-site-domain'
         )
         expect(accountId).toEqual('123456789012')
         expect(name).toEqual('test.app.gradientedge.io')
@@ -169,7 +171,7 @@ describe('TestCloudflarePagesStaticSite', () => {
       .apply(([id, urn, name, ttl, type, content, zoneId]) => {
         expect(id).toEqual('test-common-stack-site-record-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/dnsRecord:DnsRecord::test-common-stack-site-record'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/dnsRecord:DnsRecord::test-common-stack-site-record'
         )
         expect(name).toEqual('test.app')
         expect(ttl).toEqual(300)
diff --git a/src/test/cloudflare/construct/worker-site.test.ts b/src/test/cloudflare/construct/worker-site.test.ts
index cda7b8b3..272a2e48 100644
--- a/src/test/cloudflare/construct/worker-site.test.ts
+++ b/src/test/cloudflare/construct/worker-site.test.ts
@@ -100,7 +100,9 @@ describe('TestCloudflareWorkerSite', () => {
       ])
       .apply(([id, urn, name, account]) => {
         expect(id).toEqual('test-common-stack-zone-id')
-        expect(urn).toEqual('urn:pulumi:stack::project::cloudflare:index/zone:Zone::test-common-stack-zone')
+        expect(urn).toEqual(
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zone:Zone::test-common-stack-zone'
+        )
         expect(name).toEqual('gradientedge.io')
         expect(account.id).toEqual('test-account')
       })
@@ -122,7 +124,7 @@ describe('TestCloudflareWorkerSite', () => {
       .apply(([id, urn, accountId, bindings, content, scriptName]) => {
         expect(id).toEqual('test-common-stack-worker-script-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/workersScript:WorkersScript::test-common-stack-worker-script'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/workersScript:WorkersScript::test-common-stack-worker-script'
         )
         expect(accountId).toEqual('test-account')
         expect(bindings).toEqual([])
@@ -147,7 +149,7 @@ describe('TestCloudflareWorkerSite', () => {
       .apply(([id, urn, accountId, hostname, service, zoneId]) => {
         expect(id).toEqual('test-common-stack-worker-domain-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/workersCustomDomain:WorkersCustomDomain::test-common-stack-worker-domain'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/workersCustomDomain:WorkersCustomDomain::test-common-stack-worker-domain'
         )
         expect(accountId).toEqual('test-account')
         expect(hostname).toEqual('test.app.gradientedge.io')
@@ -169,7 +171,9 @@ describe('TestCloudflareWorkerSite', () => {
       ])
       .apply(([id, urn, name, rules]) => {
         expect(id).toEqual('test-common-stack-rule-id')
-        expect(urn).toEqual('urn:pulumi:stack::project::cloudflare:index/ruleset:Ruleset::test-common-stack-rule')
+        expect(urn).toEqual(
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/ruleset:Ruleset::test-common-stack-rule'
+        )
         expect(name).toEqual('testRuleSet')
         expect(rules).toEqual({
           action: 'set_cache_settings',
@@ -192,7 +196,7 @@ describe('TestCloudflareWorkerSite', () => {
       .apply(([id, urn, settingId, value, zoneId]) => {
         expect(id).toEqual('test-common-stack-zone-setting-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/zoneSetting:ZoneSetting::test-common-stack-zone-setting'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zoneSetting:ZoneSetting::test-common-stack-zone-setting'
         )
         expect(settingId).toEqual('always_online')
         expect(value).toEqual('on')
diff --git a/src/test/cloudflare/services/access-manager.test.ts b/src/test/cloudflare/services/access-manager.test.ts
index 477b1410..01ccaa31 100644
--- a/src/test/cloudflare/services/access-manager.test.ts
+++ b/src/test/cloudflare/services/access-manager.test.ts
@@ -223,7 +223,9 @@ describe('TestCloudflareAccessManager', () => {
       .all([stack.construct.zone.id, stack.construct.zone.urn, stack.construct.zone.name, stack.construct.zone.account])
       .apply(([id, urn, name, account]) => {
         expect(id).toEqual('test-zone-dev-id')
-        expect(urn).toEqual('urn:pulumi:stack::project::cloudflare:index/zone:Zone::test-zone-dev')
+        expect(urn).toEqual(
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev'
+        )
         expect(name).toEqual('gradientedge.io')
         expect(account.id).toEqual('test-account')
       })
@@ -247,7 +249,7 @@ describe('TestCloudflareAccessManager', () => {
       .apply(([id, urn, name, domain, sessionDuration, type, zoneId, corsHeaders]) => {
         expect(id).toEqual('test-access-app-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/zeroTrustAccessApplication:ZeroTrustAccessApplication::test-access-app-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zeroTrustAccessApplication:ZeroTrustAccessApplication::test-access-app-dev'
         )
         expect(name).toEqual('test-app-dev')
         expect(domain).toEqual('myapp-gradientedge.io')
@@ -278,7 +280,7 @@ describe('TestCloudflareAccessManager', () => {
       .apply(([id, urn, accountId, appId, zoneId]) => {
         expect(id).toEqual('test-access-ca-cert-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/zeroTrustAccessShortLivedCertificate:ZeroTrustAccessShortLivedCertificate::test-access-ca-cert-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zeroTrustAccessShortLivedCertificate:ZeroTrustAccessShortLivedCertificate::test-access-ca-cert-dev'
         )
         expect(appId).toEqual('test-access-app-dev-id')
         expect(zoneId).toEqual('test-access-ca-cert-dev-data-zone')
@@ -300,7 +302,7 @@ describe('TestCloudflareAccessManager', () => {
       .apply(([id, urn, name, type, customHtml]) => {
         expect(id).toEqual('test-access-custom-page-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/zeroTrustAccessCustomPage:ZeroTrustAccessCustomPage::test-access-custom-page-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zeroTrustAccessCustomPage:ZeroTrustAccessCustomPage::test-access-custom-page-dev'
         )
         expect(name).toEqual('403-dev')
         expect(type).toEqual('forbidden')
@@ -325,7 +327,7 @@ describe('TestCloudflareAccessManager', () => {
       .apply(([id, urn, name, zoneId, includes]) => {
         expect(id).toEqual('test-access-grp-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/zeroTrustAccessGroup:ZeroTrustAccessGroup::test-access-grp-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zeroTrustAccessGroup:ZeroTrustAccessGroup::test-access-grp-dev'
         )
         expect(includes).toEqual([
           {
@@ -354,7 +356,7 @@ describe('TestCloudflareAccessManager', () => {
       .apply(([id, urn, name, type, zoneId]) => {
         expect(id).toEqual('test-access-idp-otp-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/zeroTrustAccessIdentityProvider:ZeroTrustAccessIdentityProvider::test-access-idp-otp-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zeroTrustAccessIdentityProvider:ZeroTrustAccessIdentityProvider::test-access-idp-otp-dev'
         )
         expect(name).toEqual('test-idp-otp-dev')
         expect(type).toEqual('onetimepin')
@@ -377,7 +379,7 @@ describe('TestCloudflareAccessManager', () => {
       .apply(([id, urn, name, type, zoneId]) => {
         expect(id).toEqual('test-access-idp-saml-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/zeroTrustAccessIdentityProvider:ZeroTrustAccessIdentityProvider::test-access-idp-saml-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zeroTrustAccessIdentityProvider:ZeroTrustAccessIdentityProvider::test-access-idp-saml-dev'
         )
         expect(name).toEqual('test-idp-saml-dev')
         expect(type).toEqual('saml')
@@ -401,7 +403,7 @@ describe('TestCloudflareAccessManager', () => {
       .apply(([id, urn, name, zoneId, associatedHostnames, certificate]) => {
         expect(id).toEqual('test-access-mtls-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/zeroTrustAccessMtlsCertificate:ZeroTrustAccessMtlsCertificate::test-access-mtls-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zeroTrustAccessMtlsCertificate:ZeroTrustAccessMtlsCertificate::test-access-mtls-dev'
         )
         expect(name).toEqual('test-mtls-cert-dev')
         expect(zoneId).toEqual('test-access-mtls-dev-data-zone')
@@ -431,7 +433,7 @@ describe('TestCloudflareAccessManager', () => {
         ([id, urn, name, zoneId, authDomain, autoRedirectToIdentity, isUiReadOnly, userSeatExpirationInactiveTime]) => {
           expect(id).toEqual('test-access-org-dev-id')
           expect(urn).toEqual(
-            'urn:pulumi:stack::project::cloudflare:index/zeroTrustOrganization:ZeroTrustOrganization::test-access-org-dev'
+            'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zeroTrustOrganization:ZeroTrustOrganization::test-access-org-dev'
           )
           expect(name).toEqual('test-org-dev')
           expect(zoneId).toEqual('test-access-org-dev-data-zone')
@@ -459,7 +461,7 @@ describe('TestCloudflareAccessManager', () => {
       .apply(([id, urn, name, decision, includes, requires]) => {
         expect(id).toEqual('test-access-policy-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/zeroTrustAccessPolicy:ZeroTrustAccessPolicy::test-access-policy-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zeroTrustAccessPolicy:ZeroTrustAccessPolicy::test-access-policy-dev'
         )
         expect(name).toEqual('test-policy-props-dev')
         expect(decision).toEqual('allow')
@@ -495,7 +497,7 @@ describe('TestCloudflareAccessManager', () => {
       .apply(([id, urn, mode, zoneId, notes]) => {
         expect(id).toEqual('test-access-rule-ch-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/accessRule:AccessRule::test-access-rule-ch-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/accessRule:AccessRule::test-access-rule-ch-dev'
         )
         expect(mode).toEqual('challenge')
         expect(zoneId).toEqual('test-access-rule-ch-dev-data-zone')
@@ -515,7 +517,7 @@ describe('TestCloudflareAccessManager', () => {
       .apply(([id, urn, mode, zoneId, notes]) => {
         expect(id).toEqual('test-access-rule-wl-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/accessRule:AccessRule::test-access-rule-wl-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/accessRule:AccessRule::test-access-rule-wl-dev'
         )
         expect(mode).toEqual('whitelist')
         expect(zoneId).toEqual('test-access-rule-wl-dev-data-zone')
@@ -538,7 +540,7 @@ describe('TestCloudflareAccessManager', () => {
       .apply(([id, urn, name, zoneId, duration]) => {
         expect(id).toEqual('test-access-ser-token-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/zeroTrustAccessServiceToken:ZeroTrustAccessServiceToken::test-access-ser-token-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zeroTrustAccessServiceToken:ZeroTrustAccessServiceToken::test-access-ser-token-dev'
         )
         expect(name).toEqual('test-service-token-dev')
         expect(zoneId).toEqual('test-access-ser-token-dev-data-zone')
@@ -555,7 +557,7 @@ describe('TestCloudflareAccessManager', () => {
       .apply(([id, urn, name]) => {
         expect(id).toEqual('test-access-tag-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/zeroTrustAccessTag:ZeroTrustAccessTag::test-access-tag-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zeroTrustAccessTag:ZeroTrustAccessTag::test-access-tag-dev'
         )
         expect(name).toEqual('test-tag-dev')
       })
diff --git a/src/test/cloudflare/services/api-shield-manager.test.ts b/src/test/cloudflare/services/api-shield-manager.test.ts
index 50be8bb2..aaf9ad80 100644
--- a/src/test/cloudflare/services/api-shield-manager.test.ts
+++ b/src/test/cloudflare/services/api-shield-manager.test.ts
@@ -159,7 +159,9 @@ describe('TestCloudflareApiShieldManager', () => {
       .all([stack.construct.zone.id, stack.construct.zone.urn, stack.construct.zone.name, stack.construct.zone.account])
       .apply(([id, urn, name, account]) => {
         expect(id).toEqual('test-zone-dev-id')
-        expect(urn).toEqual('urn:pulumi:stack::project::cloudflare:index/zone:Zone::test-zone-dev')
+        expect(urn).toEqual(
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev'
+        )
         expect(name).toEqual('gradientedge.io')
         expect(account.id).toEqual('test-account')
       })
@@ -178,7 +180,9 @@ describe('TestCloudflareApiShieldManager', () => {
       ])
       .apply(([id, urn, authIdCharacteristics, zoneId]) => {
         expect(id).toEqual('test-api-shield-dev-id')
-        expect(urn).toEqual('urn:pulumi:stack::project::cloudflare:index/apiShield:ApiShield::test-api-shield-dev')
+        expect(urn).toEqual(
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/apiShield:ApiShield::test-api-shield-dev'
+        )
         expect(authIdCharacteristics).toEqual([
           {
             name: 'test-api-shield',
@@ -205,7 +209,7 @@ describe('TestCloudflareApiShieldManager', () => {
       .apply(([id, urn, file, kind, name, zoneId]) => {
         expect(id).toEqual('test-api-shield-sch-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/apiShieldSchema:ApiShieldSchema::test-api-shield-sch-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/apiShieldSchema:ApiShieldSchema::test-api-shield-sch-dev'
         )
         expect(file).toEqual('{\n  "test": true,\n  "hello": "world"\n}\n')
         expect(kind).toEqual('openapi_v3')
@@ -229,7 +233,7 @@ describe('TestCloudflareApiShieldManager', () => {
       .apply(([id, urn, validationDefaultMitigationAction, validationOverrideMitigationAction, zoneId]) => {
         expect(id).toEqual('test-api-shield-val-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/apiShieldSchemaValidationSettings:ApiShieldSchemaValidationSettings::test-api-shield-val-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/apiShieldSchemaValidationSettings:ApiShieldSchemaValidationSettings::test-api-shield-val-dev'
         )
         expect(validationDefaultMitigationAction).toEqual('log')
         expect(validationOverrideMitigationAction).toEqual('none')
@@ -253,7 +257,7 @@ describe('TestCloudflareApiShieldManager', () => {
       .apply(([id, urn, endpoint, host, method, zoneId]) => {
         expect(id).toEqual('test-api-shield-op-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/apiShieldOperation:ApiShieldOperation::test-api-shield-op-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/apiShieldOperation:ApiShieldOperation::test-api-shield-op-dev'
         )
         expect(endpoint).toEqual('/product')
         expect(host).toEqual('api.gradientedge.io')
@@ -277,7 +281,7 @@ describe('TestCloudflareApiShieldManager', () => {
       .apply(([id, urn, mitigationAction, operationId, zoneId]) => {
         expect(id).toEqual('test-api-shield-op-val-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/apiShieldOperationSchemaValidationSettings:ApiShieldOperationSchemaValidationSettings::test-api-shield-op-val-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/apiShieldOperationSchemaValidationSettings:ApiShieldOperationSchemaValidationSettings::test-api-shield-op-val-dev'
         )
         expect(mitigationAction).toEqual('block')
         expect(operationId).toEqual('test-api-shield-op-dev-id')
diff --git a/src/test/cloudflare/services/argo-manager.test.ts b/src/test/cloudflare/services/argo-manager.test.ts
index b26dd128..e278c767 100644
--- a/src/test/cloudflare/services/argo-manager.test.ts
+++ b/src/test/cloudflare/services/argo-manager.test.ts
@@ -101,7 +101,9 @@ describe('TestCloudflareArgoManager', () => {
       .all([stack.construct.zone.id, stack.construct.zone.urn, stack.construct.zone.name, stack.construct.zone.account])
       .apply(([id, urn, name, account]) => {
         expect(id).toEqual('test-zone-dev-id')
-        expect(urn).toEqual('urn:pulumi:stack::project::cloudflare:index/zone:Zone::test-zone-dev')
+        expect(urn).toEqual(
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev'
+        )
         expect(name).toEqual('gradientedge.io')
         expect(account.id).toEqual('test-account')
       })
@@ -120,7 +122,7 @@ describe('TestCloudflareArgoManager', () => {
       .apply(([id, urn, value]) => {
         expect(id).toEqual('test-argo-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/argoSmartRouting:ArgoSmartRouting::test-argo-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/argoSmartRouting:ArgoSmartRouting::test-argo-dev'
         )
         expect(value).toEqual('on')
       })
diff --git a/src/test/cloudflare/services/firewall-manager.test.ts b/src/test/cloudflare/services/firewall-manager.test.ts
index 36c42508..efd64d06 100644
--- a/src/test/cloudflare/services/firewall-manager.test.ts
+++ b/src/test/cloudflare/services/firewall-manager.test.ts
@@ -105,7 +105,9 @@ describe('TestCloudflareFirewallManager', () => {
       .all([stack.construct.zone.id, stack.construct.zone.urn, stack.construct.zone.name, stack.construct.zone.account])
       .apply(([id, urn, name, account]) => {
         expect(id).toEqual('test-zone-dev-id')
-        expect(urn).toEqual('urn:pulumi:stack::project::cloudflare:index/zone:Zone::test-zone-dev')
+        expect(urn).toEqual(
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev'
+        )
         expect(name).toEqual('gradientedge.io')
         expect(account.id).toEqual('test-account')
       })
@@ -124,7 +126,9 @@ describe('TestCloudflareFirewallManager', () => {
       ])
       .apply(([id, urn, bodies, expression]) => {
         expect(id).toEqual('test-filter-dev-id')
-        expect(urn).toEqual('urn:pulumi:stack::project::cloudflare:index/filter:Filter::test-filter-dev')
+        expect(urn).toEqual(
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/filter:Filter::test-filter-dev'
+        )
         expect(bodies).toEqual([
           {
             description: 'Site break-in attempts that are outside of the office',
@@ -150,7 +154,7 @@ describe('TestCloudflareFirewallManager', () => {
       .apply(([id, urn, filter, zoneId]) => {
         expect(id).toEqual('test-firewall-rule-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/firewallRule:FirewallRule::test-firewall-rule-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/firewallRule:FirewallRule::test-firewall-rule-dev'
         )
         expect(filter).toEqual({
           bodies: [
diff --git a/src/test/cloudflare/services/page-manager.test.ts b/src/test/cloudflare/services/page-manager.test.ts
index 8e149d24..e4effca5 100644
--- a/src/test/cloudflare/services/page-manager.test.ts
+++ b/src/test/cloudflare/services/page-manager.test.ts
@@ -117,7 +117,7 @@ describe('TestCloudflarePagesManager', () => {
       .apply(([id, urn, accountId, name, productionBranch]) => {
         expect(id).toEqual('test-pages-project-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/pagesProject:PagesProject::test-pages-project-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/pagesProject:PagesProject::test-pages-project-dev'
         )
         expect(accountId).toEqual('123456789012')
         expect(name).toEqual('test-simple-project-dev')
@@ -140,7 +140,7 @@ describe('TestCloudflarePagesManager', () => {
       .apply(([id, urn, accountId, name, productionBranch, buildConfig, deploymentConfigs]) => {
         expect(id).toEqual('test-pages-project-with-build-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/pagesProject:PagesProject::test-pages-project-with-build-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/pagesProject:PagesProject::test-pages-project-with-build-dev'
         )
         expect(accountId).toEqual('123456789012')
         expect(name).toEqual('test-build-config-project-dev')
@@ -198,7 +198,7 @@ describe('TestCloudflarePagesManager', () => {
       .apply(([id, urn, accountId, name, projectName]) => {
         expect(id).toEqual('test-pages-domain-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/pagesDomain:PagesDomain::test-pages-domain-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/pagesDomain:PagesDomain::test-pages-domain-dev'
         )
         expect(accountId).toEqual('123456789012')
         expect(name).toEqual('gradientedge.io')
@@ -221,7 +221,9 @@ describe('TestCloudflarePagesManager', () => {
       ])
       .apply(([id, urn, actions, priority, target, zoneId]) => {
         expect(id).toEqual('test-page-rule-dev-id')
-        expect(urn).toEqual('urn:pulumi:stack::project::cloudflare:index/pageRule:PageRule::test-page-rule-dev')
+        expect(urn).toEqual(
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/pageRule:PageRule::test-page-rule-dev'
+        )
         expect(actions).toEqual({
           emailObfuscation: 'on',
           ssl: 'flexible',
diff --git a/src/test/cloudflare/services/record-manager.test.ts b/src/test/cloudflare/services/record-manager.test.ts
index 06c25d3e..dd76fd9c 100644
--- a/src/test/cloudflare/services/record-manager.test.ts
+++ b/src/test/cloudflare/services/record-manager.test.ts
@@ -101,7 +101,9 @@ describe('TestCloudflareRecordManager', () => {
       .all([stack.construct.zone.id, stack.construct.zone.urn, stack.construct.zone.name, stack.construct.zone.account])
       .apply(([id, urn, name, account]) => {
         expect(id).toEqual('test-zone-dev-id')
-        expect(urn).toEqual('urn:pulumi:stack::project::cloudflare:index/zone:Zone::test-zone-dev')
+        expect(urn).toEqual(
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev'
+        )
         expect(name).toEqual('gradientedge.io')
         expect(account.id).toEqual('test-account')
       })
@@ -123,7 +125,9 @@ describe('TestCloudflareRecordManager', () => {
       ])
       .apply(([id, urn, name, ttl, type, content, zoneId]) => {
         expect(id).toEqual('test-arecord-dev-id')
-        expect(urn).toEqual('urn:pulumi:stack::project::cloudflare:index/dnsRecord:DnsRecord::test-arecord-dev')
+        expect(urn).toEqual(
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/dnsRecord:DnsRecord::test-arecord-dev'
+        )
         expect(name).toEqual('testARecord')
         expect(ttl).toEqual(300)
         expect(type).toEqual('A')
@@ -146,7 +150,9 @@ describe('TestCloudflareRecordManager', () => {
       ])
       .apply(([id, urn, name, ttl, type, content, zoneId]) => {
         expect(id).toEqual('test-cnamerecord-dev-id')
-        expect(urn).toEqual('urn:pulumi:stack::project::cloudflare:index/dnsRecord:DnsRecord::test-cnamerecord-dev')
+        expect(urn).toEqual(
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/dnsRecord:DnsRecord::test-cnamerecord-dev'
+        )
         expect(name).toEqual('testCNameRecord')
         expect(ttl).toEqual(300)
         expect(type).toEqual('CNAME')
diff --git a/src/test/cloudflare/services/rule-set-manager.test.ts b/src/test/cloudflare/services/rule-set-manager.test.ts
index af10aa14..d26584fe 100644
--- a/src/test/cloudflare/services/rule-set-manager.test.ts
+++ b/src/test/cloudflare/services/rule-set-manager.test.ts
@@ -94,7 +94,9 @@ describe('TestCloudflareRuleSetManager', () => {
       .all([stack.construct.zone.id, stack.construct.zone.urn, stack.construct.zone.name, stack.construct.zone.account])
       .apply(([id, urn, name, account]) => {
         expect(id).toEqual('test-zone-dev-id')
-        expect(urn).toEqual('urn:pulumi:stack::project::cloudflare:index/zone:Zone::test-zone-dev')
+        expect(urn).toEqual(
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev'
+        )
         expect(name).toEqual('gradientedge.io')
         expect(account.id).toEqual('test-account')
       })
@@ -113,7 +115,9 @@ describe('TestCloudflareRuleSetManager', () => {
       ])
       .apply(([id, urn, name, rules]) => {
         expect(id).toEqual('test-rule-set-dev-id')
-        expect(urn).toEqual('urn:pulumi:stack::project::cloudflare:index/ruleset:Ruleset::test-rule-set-dev')
+        expect(urn).toEqual(
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/ruleset:Ruleset::test-rule-set-dev'
+        )
         expect(name).toEqual('testRuleSet')
         expect(rules).toEqual({
           action: 'set_cache_settings',
diff --git a/src/test/cloudflare/services/worker-manager.test.ts b/src/test/cloudflare/services/worker-manager.test.ts
index befbe3bc..a61785b9 100644
--- a/src/test/cloudflare/services/worker-manager.test.ts
+++ b/src/test/cloudflare/services/worker-manager.test.ts
@@ -154,7 +154,9 @@ describe('TestCloudflareWorkerManager', () => {
       .all([stack.construct.zone.id, stack.construct.zone.urn, stack.construct.zone.name, stack.construct.zone.account])
       .apply(([id, urn, name, account]) => {
         expect(id).toEqual('test-zone-dev-id')
-        expect(urn).toEqual('urn:pulumi:stack::project::cloudflare:index/zone:Zone::test-zone-dev')
+        expect(urn).toEqual(
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev'
+        )
         expect(name).toEqual('gradientedge.io')
         expect(account.id).toEqual('test-account')
       })
@@ -176,7 +178,7 @@ describe('TestCloudflareWorkerManager', () => {
       .apply(([id, urn, accountId, hostname, service, zoneId]) => {
         expect(id).toEqual('test-worker-domain-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/workersCustomDomain:WorkersCustomDomain::test-worker-domain-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/workersCustomDomain:WorkersCustomDomain::test-worker-domain-dev'
         )
         expect(accountId).toEqual('test-account')
         expect(hostname).toEqual('test.gradientedge.io')
diff --git a/src/test/cloudflare/services/zone-manager.test.ts b/src/test/cloudflare/services/zone-manager.test.ts
index 749a3863..14a1449a 100644
--- a/src/test/cloudflare/services/zone-manager.test.ts
+++ b/src/test/cloudflare/services/zone-manager.test.ts
@@ -136,7 +136,9 @@ describe('TestCloudflareZoneManager', () => {
       .all([stack.construct.zone.id, stack.construct.zone.urn, stack.construct.zone.name, stack.construct.zone.account])
       .apply(([id, urn, name, account]) => {
         expect(id).toEqual('test-zone-dev-id')
-        expect(urn).toEqual('urn:pulumi:stack::project::cloudflare:index/zone:Zone::test-zone-dev')
+        expect(urn).toEqual(
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev'
+        )
         expect(name).toEqual('gradientedge.io')
         expect(account.id).toEqual('test-account')
       })
@@ -155,7 +157,7 @@ describe('TestCloudflareZoneManager', () => {
       .apply(([id, urn, zoneId]) => {
         expect(id).toEqual('test-zone-cache-reserve-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/zoneCacheReserve:ZoneCacheReserve::test-zone-cache-reserve-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zoneCacheReserve:ZoneCacheReserve::test-zone-cache-reserve-dev'
         )
         expect(zoneId).toEqual('test-zone-dev-id')
       })
@@ -175,7 +177,7 @@ describe('TestCloudflareZoneManager', () => {
       .apply(([id, urn, value, zoneId]) => {
         expect(id).toEqual('test-zone-cache-variants-dev-id')
         expect(urn).toEqual(
-          'urn:pulumi:stack::project::cloudflare:index/zoneCacheVariants:ZoneCacheVariants::test-zone-cache-variants-dev'
+          'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zoneCacheVariants:ZoneCacheVariants::test-zone-cache-variants-dev'
         )
         expect(value).toEqual({
           avif: ['image/avif', 'image/webp'],