diff --git a/.aws/.terraform-version b/.aws/.terraform-version
index ec70f7556..8decb929b 100644
--- a/.aws/.terraform-version
+++ b/.aws/.terraform-version
@@ -1 +1 @@
-1.6.6
+1.8.5
diff --git a/.aws/src/config/index.ts b/.aws/src/config/index.ts
index 7487febd0..ba092a9eb 100644
--- a/.aws/src/config/index.ts
+++ b/.aws/src/config/index.ts
@@ -44,5 +44,8 @@ export const config = {
   tags: {
     service: name,
     environment,
+    app_code: 'content',
+    component_code: `content-${name.toLowerCase()}`,
+    env_code: isDev ? 'dev' : 'prod',
   },
 };
diff --git a/.aws/src/main.ts b/.aws/src/main.ts
index 8dc9b53f7..5b5db5d3b 100644
--- a/.aws/src/main.ts
+++ b/.aws/src/main.ts
@@ -30,7 +30,10 @@ class Stack 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');
@@ -148,7 +151,6 @@ class Stack extends TerraformStack {
       internal: false,
       prefix: config.prefix,
       alb6CharacterPrefix: config.shortName,
-      tags: config.tags,
       cdn: false,
       domain: config.domain,
       containerConfigs: [
@@ -373,7 +375,6 @@ class Stack extends TerraformStack {
         name: `/Backend/${config.prefix}/ecs/${containerName}`,
         retentionInDays: 90,
         skipDestroy: true,
-        tags: config.tags,
       }
     );