diff --git a/schema/.source.json b/schema/.source.json
index dad0ef6..ff46331 100644
--- a/schema/.source.json
+++ b/schema/.source.json
@@ -1,5 +1,5 @@
 {
   "url": "https://raw.githubusercontent.com/mozilla/enterprise-firefox/enterprise-main/browser/components/enterprisepolicies/schemas/policies-schema.json",
-  "commit": "c745341954c2ebdbad1cd8b9c27f927e0e26ca51",
-  "permalink": "https://github.com/mozilla/enterprise-firefox/blob/c745341954c2ebdbad1cd8b9c27f927e0e26ca51/browser/components/enterprisepolicies/schemas/policies-schema.json"
+  "commit": "523cd2ebe71cad1bb0924df5a874b431fc25ad91",
+  "permalink": "https://github.com/mozilla/enterprise-firefox/blob/523cd2ebe71cad1bb0924df5a874b431fc25ad91/browser/components/enterprisepolicies/schemas/policies-schema.json"
 }
diff --git a/schema/policies-schema.json b/schema/policies-schema.json
index f8b1699..691efde 100644
--- a/schema/policies-schema.json
+++ b/schema/policies-schema.json
@@ -827,6 +827,48 @@
       }
     },
 
+    "ClearOnShutdown": {
+      "type": ["boolean", "object"],
+      "x-category": "Local data storage",
+      "x-compatibility": {
+        "firefox": { "version_added": "158" },
+        "firefox_esr": { "version_added": false },
+        "firefox_enterprise": { "version_added": "158" }
+      },
+      "x-restart-required": true,
+      "description": "Clear browsing data when the browser closes. Only the named categories are enforced.",
+      "examples": [
+        false,
+        {
+          "BrowsingHistoryAndDownloads": true,
+          "CookiesAndStorage": true,
+          "Cache": true,
+          "Exceptions": ["https://example.com"]
+        }
+      ],
+      "properties": {
+        "BrowsingHistoryAndDownloads": {
+          "type": "boolean"
+        },
+        "CookiesAndStorage": {
+          "type": "boolean"
+        },
+        "Cache": {
+          "type": "boolean"
+        },
+        "FormData": {
+          "type": "boolean"
+        },
+        "SiteSettings": {
+          "type": "boolean"
+        },
+        "Exceptions": {
+          "type": "array",
+          "items": { "$ref": "#/definitions/origin" }
+        }
+      }
+    },
+
     "CNSA2KeyAgreementEnabled": {
       "type": "boolean",
       "x-category": "Network security",
@@ -1641,10 +1683,13 @@
       "x-compatibility": {
         "firefox": { "version_added": "155" },
         "firefox_esr": { "version_added": false },
-        "firefox_enterprise": { "version_added": "155" }
+        "firefox_enterprise": { "version_added": "155" },
+        "notes": [
+          "Windows support added in 155, macOS support added in 156. Has no effect on Linux."
+        ]
       },
       "x-restart-required": true,
-      "description": "Prevent Firefox from launching automatically when the user logs in, and prevent the user from enabling this setting. This policy currently only has an effect on Windows.",
+      "description": "Prevent Firefox from launching automatically when the user logs in, and prevent the user from enabling this setting.",
       "examples": [true]
     },
     "DisableLocalPolicies": {
@@ -2091,19 +2136,6 @@
       }
     },
 
-    "EnterpriseStorageEncryption": {
-      "type": "boolean",
-      "x-category": "Miscellaneous",
-      "x-compatibility": {
-        "firefox": { "version_added": false },
-        "firefox_esr": { "version_added": false },
-        "firefox_enterprise": { "version_added": "149" }
-      },
-      "x-restart-required": true,
-      "description": "Enable an enterprise-managed primary password so that stored credentials and other sensitive profile data are kept encrypted at rest.",
-      "examples": [true]
-    },
-
     "ExemptDomainFileTypePairsFromFileTypeDownloadWarnings": {
       "type": "array",
       "x-category": "Network security",
@@ -4191,6 +4223,54 @@
       "examples": [true]
     },
 
+    "SignOut": {
+      "type": "object",
+      "x-category": "Authentication",
+      "x-compatibility": {
+        "firefox": {
+          "version_added": false
+        },
+        "firefox_esr": {
+          "version_added": false
+        },
+        "firefox_enterprise": {
+          "version_added": "158"
+        }
+      },
+      "x-restart-required": false,
+      "description": "Configure sign-out behavior for enterprise users.",
+      "examples": [
+        {
+          "Shutdown": {
+            "Action": "lock"
+          }
+        }
+      ],
+      "properties": {
+        "Shutdown": {
+          "type": "object",
+          "properties": {
+            "Action": {
+              "type": "string",
+              "oneOf": [
+                {
+                  "const": "signout",
+                  "title": "Sign out",
+                  "description": "Sign the session out when the browser shuts down, so the next launch requires a full sign-in. This is what happens when the policy is not set."
+                },
+                {
+                  "const": "lock",
+                  "title": "Lock",
+                  "description": "Lock the session when the browser shuts down, so the next launch only requires the user to unlock."
+                }
+              ]
+            }
+          },
+          "required": ["Action"]
+        }
+      }
+    },
+
     "SitePolicies": {
       "type": "array",
       "x-category": "Browsing restrictions",
@@ -4220,6 +4300,12 @@
             "Policies": {
               "HttpsOnly": true
             }
+          },
+          {
+            "Match": ["*.example.com"],
+            "Policies": {
+              "Container": { "id": "work" }
+            }
           }
         ]
       ],
@@ -4249,6 +4335,19 @@
               },
               "DisableServiceWorkers": {
                 "type": "boolean"
+              },
+              "Container": {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "type": "string",
+                    "minLength": 1
+                  },
+                  "ephemeral": {
+                    "type": "boolean"
+                  }
+                },
+                "required": ["id"]
               }
             }
           }