diff --git a/test/contexts/airbyte.yaml b/test/contexts/airbyte.yaml
index e018c9d9..edd30936 100644
--- a/test/contexts/airbyte.yaml
+++ b/test/contexts/airbyte.yaml
@@ -1,5 +1,6 @@
 cluster: mgmt
+stackCluster: mgmt
 cloud: aws
 bucket: plrl-airbyte-logs
 hostname: airbyte.plural.sh
-region: us-east-2
\ No newline at end of file
+region: us-east-2
diff --git a/test/outputs/bootstrap/apps/airbyte/mgmt/airbyte-raw-servicedeployment.yaml b/test/outputs/bootstrap/apps/airbyte/mgmt/airbyte-raw-servicedeployment.yaml
index efbb49de..a9684b1a 100644
--- a/test/outputs/bootstrap/apps/airbyte/mgmt/airbyte-raw-servicedeployment.yaml
+++ b/test/outputs/bootstrap/apps/airbyte/mgmt/airbyte-raw-servicedeployment.yaml
@@ -13,7 +13,7 @@ spec:
     name: infra
     namespace: infra
   configuration:
-    hostname: airbyte.plrl-dev-aws.onplural.sh
+    hostname: airbyte.plural.sh
   clusterRef:
     kind: Cluster
     name: mgmt
diff --git a/test/outputs/bootstrap/apps/airbyte/mgmt/airbyte-servicedeployment.yaml b/test/outputs/bootstrap/apps/airbyte/mgmt/airbyte-servicedeployment.yaml
index bb2518cd..3c887fef 100644
--- a/test/outputs/bootstrap/apps/airbyte/mgmt/airbyte-servicedeployment.yaml
+++ b/test/outputs/bootstrap/apps/airbyte/mgmt/airbyte-servicedeployment.yaml
@@ -26,8 +26,9 @@ spec:
       namespace: apps
   configuration:
     cluster: mgmt
-    hostname: airbyte.plrl-dev-aws.onplural.sh
-    bucket: plrl-catalog-airbyte-1
+    hostname: airbyte.plural.sh
+    bucket: plrl-airbyte-logs
+    region: us-east-2
   clusterRef:
     kind: Cluster
     name: mgmt
diff --git a/test/outputs/bootstrap/apps/airbyte/mgmt/oauth-proxy-config-servicedeployment.yaml b/test/outputs/bootstrap/apps/airbyte/mgmt/oauth-proxy-config-servicedeployment.yaml
index 89122136..cb1606b3 100644
--- a/test/outputs/bootstrap/apps/airbyte/mgmt/oauth-proxy-config-servicedeployment.yaml
+++ b/test/outputs/bootstrap/apps/airbyte/mgmt/oauth-proxy-config-servicedeployment.yaml
@@ -24,7 +24,7 @@ spec:
       namespace: apps
   configuration:
     cluster: mgmt
-    hostname: airbyte.plrl-dev-aws.onplural.sh
+    hostname: airbyte.plural.sh
   clusterRef:
     kind: Cluster
     name: mgmt
diff --git a/test/outputs/helm/airbyte/mgmt/airbyte.yaml.liquid b/test/outputs/helm/airbyte/mgmt/airbyte.yaml.liquid
index 0427b919..e0cc77e5 100644
--- a/test/outputs/helm/airbyte/mgmt/airbyte.yaml.liquid
+++ b/test/outputs/helm/airbyte/mgmt/airbyte.yaml.liquid
@@ -11,7 +11,7 @@ global:
     type: S3
     storageSecretName: airbyte-airbyte-secrets
     s3:
-      region: us-east-2
+      region: {{ configuration.region }}
       authenticationType: credentials
       accessKeyId: {{ imports[imports_airbyte_key].access_key_id }}
       accessKeyIdSecretKey: AWS_ACCESS_KEY_ID
diff --git a/test/outputs/terraform/apps/airbyte/mgmt/oidc.tf b/test/outputs/terraform/apps/airbyte/mgmt/oidc.tf
index 8af5cc3a..3e85b135 100644
--- a/test/outputs/terraform/apps/airbyte/mgmt/oidc.tf
+++ b/test/outputs/terraform/apps/airbyte/mgmt/oidc.tf
@@ -7,9 +7,9 @@ resource "random_password" "oidc_cookie" {
 }
 
 resource "plural_oidc_provider" "airbyte" {
-  name = "airbyte-{{ context.cluster }}"
+  name = "airbyte-mgmt"
   auth_method = "BASIC"
   type = "PLURAL"
-  description = "OIDC provider for airbyte deployed to the {{ context.cluster }} cluster"
-  redirect_uris = ["https://{{ context.hostname }}/oauth2/callback"]
+  description = "OIDC provider for airbyte deployed to the mgmt cluster"
+  redirect_uris = ["https://airbyte.plrl-dev-aws.onplural.sh/oauth2/callback"]
 }
diff --git a/test/outputs/terraform/apps/airbyte/mgmt/variables.tf b/test/outputs/terraform/apps/airbyte/mgmt/variables.tf
index 487c7364..9fddd530 100644
--- a/test/outputs/terraform/apps/airbyte/mgmt/variables.tf
+++ b/test/outputs/terraform/apps/airbyte/mgmt/variables.tf
@@ -1,11 +1,11 @@
 variable "cluster_name" {
   type = string
-  default = "{{ context.cluster }}"
+  default = "mgmt"
 }
 
 variable "airbyte_bucket" {
   type = string
-  default = "{{ context.bucket }}"
+  default = "plrl-airbyte-logs"
 }
 
 variable "force_destroy_bucket" {
@@ -15,7 +15,7 @@ variable "force_destroy_bucket" {
 }
 
 variable "db_name" {
-  default = "plrl-{{ context.cluster }}-airbyte"
+  default = "plrl-mgmt-airbyte"
 }
 
 variable "postgres_vsn" {
@@ -38,4 +38,4 @@ variable "backup_retention_period" {
 
 variable "db_instance_class" {
   default = "db.t4g.large"
-}
\ No newline at end of file
+}
diff --git a/test/outputs/terraform/apps/airbyte/mgmt/versions.tf b/test/outputs/terraform/apps/airbyte/mgmt/versions.tf
index 54f47de0..f814cc9d 100644
--- a/test/outputs/terraform/apps/airbyte/mgmt/versions.tf
+++ b/test/outputs/terraform/apps/airbyte/mgmt/versions.tf
@@ -15,5 +15,5 @@ terraform {
 provider "plural" {}
 
 provider "aws" {
-  region = "{{ context.region }}"
-}
\ No newline at end of file
+  region = "us-east-2"
+}