diff --git a/src/servala/core/crd.py b/src/servala/core/crd.py
index f2a8823..e0d05e8 100644
--- a/src/servala/core/crd.py
+++ b/src/servala/core/crd.py
@@ -192,9 +192,11 @@ class CrdModelFormMixin:
         for field in ("organization", "context"):
             self.fields[field].widget = forms.HiddenInput()
 
-        for field_name in self.HIDDEN_FIELDS:
-            if field_name in self.fields:
-                self.fields[field_name].widget = forms.HiddenInput()
+        for name, field in self.fields.items():
+            if name in self.HIDDEN_FIELDS or any(
+                name.startswith(f) for f in self.HIDDEN_FIELDS
+            ):
+                field.widget = forms.HiddenInput()
 
         if self.instance and self.instance.pk:
             self.fields["name"].disabled = True