diff --git a/proto/buf.yaml b/proto/buf.yaml
index 5d5a33e93d..f8cf192a95 100644
--- a/proto/buf.yaml
+++ b/proto/buf.yaml
@@ -19,6 +19,7 @@ lint:
     - zitadel/auth.proto
     - zitadel/change.proto
     - zitadel/event.proto
+    - zitadel/feature.proto
     - zitadel/idp.proto
     - zitadel/instance.proto
     - zitadel/management.proto
diff --git a/proto/zitadel/feature.proto b/proto/zitadel/feature.proto
new file mode 100644
index 0000000000..7b82f71517
--- /dev/null
+++ b/proto/zitadel/feature.proto
@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+package zitadel.feature.v1;
+
+option go_package ="github.com/zitadel/zitadel/pkg/grpc/feature";
+
+enum InstanceFeature {
+  INSTANCE_FEATURE_UNSPECIFIED = 0;
+  INSTANCE_FEATURE_LOGIN_DEFAULT_ORG = 1;
+}
\ No newline at end of file
diff --git a/proto/zitadel/system.proto b/proto/zitadel/system.proto
index ad311b2de7..ed2e73d29d 100644
--- a/proto/zitadel/system.proto
+++ b/proto/zitadel/system.proto
@@ -6,6 +6,7 @@ import "zitadel/instance.proto";
 import "zitadel/member.proto";
 import "zitadel/quota.proto";
 import "zitadel/auth_n_key.proto";
+import "zitadel/feature.proto";
 
 import "google/api/annotations.proto";
 import "google/protobuf/timestamp.proto";
@@ -894,8 +895,7 @@ message FailedEvent {
 
 message SetInstanceFeatureRequest {
   string instance_id = 1 [(validate.rules).string = {min_len: 1, max_len: 200}];
-  // the feature (id) according to [internal/domain/feature.go]
-  int32 feature_id = 2 [(validate.rules).int32 = {gt: 0}];
+  zitadel.feature.v1.InstanceFeature feature_id = 2 [(validate.rules).enum = {not_in: 0, defined_only: true}];
   // value based on the feature type
   oneof value {
     option (validate.required) = true;