diff --git a/internal/apply/manager_test.go b/internal/apply/manager_test.go
index 539e7e0..6060a37 100644
--- a/internal/apply/manager_test.go
+++ b/internal/apply/manager_test.go
@@ -110,7 +110,6 @@ func createTestDeploymentPlan() *DeploymentPlan {
 			{
 				Type: ActionCreate,
 				Target: config.InfraTemplate{
-					Organization: "testorg",
 					Region:       "US",
 					CloudletOrg:  "cloudletorg",
 					CloudletName: "cloudlet1",
@@ -137,8 +136,9 @@ func createTestManagerConfig(t *testing.T) *config.EdgeConnectConfig {
 	return &config.EdgeConnectConfig{
 		Kind: "edgeconnect-deployment",
 		Metadata: config.Metadata{
-			Name:       "test-app",
-			AppVersion: "1.0.0",
+			Name:         "test-app",
+			AppVersion:   "1.0.0",
+			Organization: "testorg",
 		},
 		Spec: config.Spec{
 			K8sApp: &config.K8sApp{
@@ -146,7 +146,6 @@ func createTestManagerConfig(t *testing.T) *config.EdgeConnectConfig {
 			},
 			InfraTemplate: []config.InfraTemplate{
 				{
-					Organization: "testorg",
 					Region:       "US",
 					CloudletOrg:  "cloudletorg",
 					CloudletName: "cloudlet1",
@@ -309,7 +308,6 @@ func TestApplyDeploymentMultipleInstances(t *testing.T) {
 			{
 				Type: ActionCreate,
 				Target: config.InfraTemplate{
-					Organization: "testorg",
 					Region:       "US",
 					CloudletOrg:  "cloudletorg1",
 					CloudletName: "cloudlet1",
@@ -321,7 +319,6 @@ func TestApplyDeploymentMultipleInstances(t *testing.T) {
 			{
 				Type: ActionCreate,
 				Target: config.InfraTemplate{
-					Organization: "testorg",
 					Region:       "EU",
 					CloudletOrg:  "cloudletorg2",
 					CloudletName: "cloudlet2",
diff --git a/internal/apply/planner_test.go b/internal/apply/planner_test.go
index 5568dea..d946a14 100644
--- a/internal/apply/planner_test.go
+++ b/internal/apply/planner_test.go
@@ -112,8 +112,9 @@ func createTestConfig(t *testing.T) *config.EdgeConnectConfig {
 	return &config.EdgeConnectConfig{
 		Kind: "edgeconnect-deployment",
 		Metadata: config.Metadata{
-			Name:       "test-app",
-			AppVersion: "1.0.0",
+			Name:         "test-app",
+			AppVersion:   "1.0.0",
+			Organization: "testorg",
 		},
 		Spec: config.Spec{
 			K8sApp: &config.K8sApp{
@@ -121,7 +122,6 @@ func createTestConfig(t *testing.T) *config.EdgeConnectConfig {
 			},
 			InfraTemplate: []config.InfraTemplate{
 				{
-					Organization: "testorg",
 					Region:       "US",
 					CloudletOrg:  "TestCloudletOrg",
 					CloudletName: "TestCloudlet",
@@ -192,7 +192,7 @@ func TestPlanExistingDeploymentNoChanges(t *testing.T) {
 			Name:         "test-app",
 			Version:      "1.0.0",
 		},
-		Deployment: "kubernetes",
+		Deployment:         "kubernetes",
 		DeploymentManifest: manifestContent,
 		RequiredOutboundConnections: []edgeconnect.SecurityRule{
 			{
@@ -286,7 +286,6 @@ func TestPlanMultipleInfrastructures(t *testing.T) {
 
 	// Add a second infrastructure target
 	testConfig.Spec.InfraTemplate = append(testConfig.Spec.InfraTemplate, config.InfraTemplate{
-		Organization: "testorg",
 		Region:       "EU",
 		CloudletOrg:  "EUCloudletOrg",
 		CloudletName: "EUCloudlet",