diff --git a/config/flipt.schema.cue b/config/flipt.schema.cue
index 750b97bb1c..127dfaa5f1 100644
--- a/config/flipt.schema.cue
+++ b/config/flipt.schema.cue
@@ -51,6 +51,7 @@ import "strings"
 				bootstrap?: {
 					token?:     string
 					expiration: =~#duration | int
+					metadata?: [string]: string
 				}
 			}
 
@@ -163,7 +164,7 @@ import "strings"
 	#cloud: {
 		host?:         string | *"flipt.cloud"
 		organization?: string
-		gateway?:     string
+		gateway?:      string
 		authentication?: {
 			api_key?: string
 		}
@@ -358,9 +359,9 @@ import "strings"
 	#audit: {
 		sinks?: {
 			log?: {
-				enabled?: bool | *false
-				file?:    string | *""
-				encoding?:   *"" | "json" | "console"
+				enabled?:  bool | *false
+				file?:     string | *""
+				encoding?: *"" | "json" | "console"
 			}
 			webhook?: {
 				enabled?:              bool | *false
diff --git a/config/flipt.schema.json b/config/flipt.schema.json
index 7bf9419ee0..61c06075c2 100644
--- a/config/flipt.schema.json
+++ b/config/flipt.schema.json
@@ -123,6 +123,10 @@
                           "type": "integer"
                         }
                       ]
+                    },
+                    "metadata": {
+                      "type": ["object", "null"],
+                      "additionalProperties": true
                     }
                   }
                 }