diff --git a/.aws/src/config/index.ts b/.aws/src/config/index.ts
index 32c0629e..bb75b715 100644
--- a/.aws/src/config/index.ts
+++ b/.aws/src/config/index.ts
@@ -36,5 +36,8 @@ export const config = {
   tags: {
     service: name,
     environment,
+    app_code: 'pocket',
+    component_code: 'pocket-pocket-hits',
+    env_code: isDev ? 'dev' : 'prod',
   },
 };
diff --git a/.aws/src/main.ts b/.aws/src/main.ts
index 0427c3d7..3b1f2cd1 100644
--- a/.aws/src/main.ts
+++ b/.aws/src/main.ts
@@ -25,7 +25,10 @@ class BrazeContentProxy extends TerraformStack {
   constructor(scope: Construct, name: string) {
     super(scope, name);
 
-    new AwsProvider(this, 'aws', { region: 'us-east-1' });
+    new AwsProvider(this, 'aws', { 
+      region: 'us-east-1',
+      defaultTags: [{ tags: config.tags }],
+    });
     new PagerdutyProvider(this, 'pagerduty_provider', { token: undefined });
     new LocalProvider(this, 'local_provider');
     new NullProvider(this, 'null_provider');
@@ -136,7 +139,6 @@ class BrazeContentProxy extends TerraformStack {
       internal: false,
       prefix: config.prefix,
       alb6CharacterPrefix: config.shortName,
-      tags: config.tags,
       cdn: true,
       domain: config.domain,
       containerConfigs: [