diff --git a/src/providers/aws/pulumi/base-image-snapshot.ts b/src/providers/aws/pulumi/base-image-snapshot.ts
index 52cb67f8..0343fd21 100644
--- a/src/providers/aws/pulumi/base-image-snapshot.ts
+++ b/src/providers/aws/pulumi/base-image-snapshot.ts
@@ -28,7 +28,6 @@ class CloudyPadAwsBaseImage extends pulumi.ComponentResource {
         super("crafteo:cloudypad:aws:base-image", name, args, opts)
 
         const globalTags = pulumi.all([args.additionalTags]).apply(([tags]) => [
-            name,
             ...tags
         ])
 
@@ -166,7 +165,7 @@ export class AwsBaseImagePulumiClient extends InstancePulumiClient<PulumiStackCo
 
         const stack = await this.getStack()
         await stack.setConfig("aws:region", { value: config.region})
-        await stack.setConfig("additionalTags", { value: JSON.stringify([`instance:${config.instanceName}`])})
+        await stack.setConfig("additionalTags", { value: JSON.stringify([`CloudyPadInstance:${config.instanceName}`, `DeployedBy:cloudypad`])})
         if(config.rootVolumeId) await stack.setConfig("rootVolumeId", { value: config.rootVolumeId})
 
         const allConfs = await stack.getAllConfig()
diff --git a/src/providers/aws/pulumi/data-volume-snapshot.ts b/src/providers/aws/pulumi/data-volume-snapshot.ts
index 6a02cd77..4ab7aa86 100644
--- a/src/providers/aws/pulumi/data-volume-snapshot.ts
+++ b/src/providers/aws/pulumi/data-volume-snapshot.ts
@@ -25,7 +25,6 @@ class CloudyPadAwsDataDiskSnapshot extends pulumi.ComponentResource {
         super("crafteo:cloudypad:aws:data-disk-snapshot", name, args, opts)
 
         const globalTags = pulumi.all([args.additionalTags]).apply(([tags]) => [
-            name,
             ...tags
         ])
 
@@ -120,7 +119,7 @@ export class AwsDataDiskSnapshotPulumiClient extends InstancePulumiClient<Pulumi
 
         const stack = await this.getStack()
         await stack.setConfig("aws:region", { value: config.region})
-        await stack.setConfig("additionalTags", { value: JSON.stringify([`instance:${config.instanceName}`])})
+        await stack.setConfig("additionalTags", { value: JSON.stringify([`CloudyPadInstance:${config.instanceName}`, `DeployedBy:cloudypad`])})
         await stack.setConfig("volumeId", { value: config.baseVolumeId})
 
         const allConfs = await stack.getAllConfig()
diff --git a/src/providers/aws/pulumi/main.ts b/src/providers/aws/pulumi/main.ts
index 270801cf..74e2808c 100644
--- a/src/providers/aws/pulumi/main.ts
+++ b/src/providers/aws/pulumi/main.ts
@@ -145,7 +145,8 @@ class CloudyPadEC2Instance extends pulumi.ComponentResource {
         } else if (args.publicKeyContent){
             this.keyPair = new aws.ec2.KeyPair(`${name}-keypair`, {
                 publicKey: args.publicKeyContent,
-                keyName: awsResourceNamePrefix
+                keyName: awsResourceNamePrefix,
+                tags: globalTags,
             }, {
                 ...commonPulumiOpts,
                 ignoreChanges: args.ignorePublicKeyChanges ? [ "publicKey" ] : []
@@ -180,7 +181,7 @@ class CloudyPadEC2Instance extends pulumi.ComponentResource {
                     ...args.tags,
                     Name: awsResourceNamePrefix
                 },
-                volumeTags: args.tags,
+                volumeTags: { ...args.tags, Name: `${awsResourceNamePrefix}-os` },
                 vpcSecurityGroupIds: [this.securityGroup.id],
                 keyName: this.keyPairName,
                 rootBlockDevice: {
@@ -213,7 +214,7 @@ class CloudyPadEC2Instance extends pulumi.ComponentResource {
                     size: args.dataDisk.sizeGb,
                     type: "gp3",
                     availabilityZone: this.ec2Instance.availabilityZone,
-                    tags: globalTags,
+                    tags: { ...globalTags, Name: `${awsResourceNamePrefix}-data` },
                     snapshotId: args.dataDisk.snapshotId,
                 }, {
                     ...commonPulumiOpts,
@@ -310,6 +311,11 @@ async function awsPulumiProgram(): Promise<Record<string, any> | void> {
 
     const instanceName = pulumi.getStack()
 
+    const cloudypadTags = {
+        DeployedBy: "cloudypad",
+        CloudyPadInstance: instanceName,
+    }
+
     // Use provided imageId if available, otherwise use default Ubuntu AMI
     const amiId = imageId ? pulumi.output(imageId) : aws.ec2.getAmiOutput({
         mostRecent: true,
@@ -350,6 +356,7 @@ async function awsPulumiProgram(): Promise<Record<string, any> | void> {
     }
 
     const instance = new CloudyPadEC2Instance(instanceName, {
+        tags: cloudypadTags,
         ami: amiId,
         type: instanceType,
         availabilityZone: zone,