diff --git a/e2e/namespace_metadata_test.go b/e2e/namespace_metadata_test.go
index 249bc42e..cb366be5 100644
--- a/e2e/namespace_metadata_test.go
+++ b/e2e/namespace_metadata_test.go
@@ -28,14 +28,16 @@ var _ = Describe("creating a Namespace for a Tenant with additional metadata", f
 					Kind: "User",
 				},
 			},
-			NamespacesMetadata: &capsulev1beta1.AdditionalMetadataSpec{
-				AdditionalLabels: map[string]string{
-					"k8s.io/custom-label":     "foo",
-					"clastix.io/custom-label": "bar",
-				},
-				AdditionalAnnotations: map[string]string{
-					"k8s.io/custom-annotation":     "bizz",
-					"clastix.io/custom-annotation": "buzz",
+			NamespaceOptions: &capsulev1beta1.NamespaceOptions{
+				AdditionalMetadata: &capsulev1beta1.AdditionalMetadataSpec{
+					AdditionalLabels: map[string]string{
+						"k8s.io/custom-label":     "foo",
+						"clastix.io/custom-label": "bar",
+					},
+					AdditionalAnnotations: map[string]string{
+						"k8s.io/custom-annotation":     "bizz",
+						"clastix.io/custom-annotation": "buzz",
+					},
 				},
 			},
 		},
@@ -58,7 +60,7 @@ var _ = Describe("creating a Namespace for a Tenant with additional metadata", f
 		By("checking additional labels", func() {
 			Eventually(func() (ok bool) {
 				Expect(k8sClient.Get(context.TODO(), types.NamespacedName{Name: ns.GetName()}, ns)).Should(Succeed())
-				for k, v := range tnt.Spec.NamespacesMetadata.AdditionalLabels {
+				for k, v := range tnt.Spec.NamespaceOptions.AdditionalMetadata.AdditionalLabels {
 					if ok, _ = HaveKeyWithValue(k, v).Match(ns.Labels); !ok {
 						return
 					}
@@ -69,7 +71,7 @@ var _ = Describe("creating a Namespace for a Tenant with additional metadata", f
 		By("checking additional annotations", func() {
 			Eventually(func() (ok bool) {
 				Expect(k8sClient.Get(context.TODO(), types.NamespacedName{Name: ns.GetName()}, ns)).Should(Succeed())
-				for k, v := range tnt.Spec.NamespacesMetadata.AdditionalAnnotations {
+				for k, v := range tnt.Spec.NamespaceOptions.AdditionalMetadata.AdditionalAnnotations {
 					if ok, _ = HaveKeyWithValue(k, v).Match(ns.Annotations); !ok {
 						return
 					}
diff --git a/e2e/overquota_namespace_test.go b/e2e/overquota_namespace_test.go
index e430017c..d94df8bc 100644
--- a/e2e/overquota_namespace_test.go
+++ b/e2e/overquota_namespace_test.go
@@ -28,7 +28,9 @@ var _ = Describe("creating a Namespace in over-quota of three", func() {
 					Kind: "User",
 				},
 			},
-			NamespaceQuota: pointer.Int32Ptr(3),
+			NamespaceOptions: &capsulev1beta1.NamespaceOptions{
+				Quota:              pointer.Int32Ptr(3),
+			},
 		},
 	}