diff --git a/CHANGELOG.md b/CHANGELOG.md
index f46b1c3cb..815f0a949 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,31 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.18.0] - 2026-06-05
+
+### Added
+- feat: add agentcore exec command with interactive shell and one-shot support (#1464) (259654b6)
+- feat: add BYO filesystem e2e test and supporting infrastructure (#1461) (dd255e3e)
+- feat: upgrade agent-inspector to v0.5.0 (#1458) (d14504ff)
+- feat: add EFS and S3 filesystem mount support (#1436) (64b9b636)
+
+### Fixed
+- fix(ci): pass filesystem env vars to e2e-tests-full vitest step (#1470) (a4c75ec8)
+- fix(deploy): bump aws-cdk-lib to ^2.258.0 to unblock e2e workspace resolution (#1469) (b4a7620c)
+- fix(deploy): bump @aws-cdk/cdk-assets-lib to read schema 54 asset manifests (#1468) (b071a9f9)
+- fix(deploy): bump @aws-cdk/toolkit-lib to read cloud-assembly schema 54 (#1465) (c42c5b4e)
+- fix(logs): wire up cli telemetry and model user errors (#1460) (5b98e76e)
+- fix(deploy): preserve error typing through CDK wrapper and preflight (#1459) (31269050)
+- fix(telemetry): re-throw exceptions in withCommandRunTelemetry (#1437) (15618b6f)
+- fix: agentcore dev orphaned processes (#1438) (c9d78ea2)
+
+### Documentation
+- docs: add documentation for telemetry (#1432) (65ba4850)
+
+### Other Changes
+- refactor: move command descriptions out of TUI module (#1451) (5e035d05)
+- Update image size limit from 1 GB to 2 GB (#1452) (77c3de39)
+
 ## [0.17.0] - 2026-06-02
 
 ### Added
diff --git a/package.json b/package.json
index 8a222c417..ebe97f13c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws/agentcore",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "CLI for Amazon Bedrock AgentCore",
   "license": "Apache-2.0",
   "repository": {
diff --git a/preview-version.json b/preview-version.json
index ec0614e88..b17d5516b 100644
--- a/preview-version.json
+++ b/preview-version.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.0.0-preview.11"
+  "version": "1.0.0-preview.12"
 }
diff --git a/schemas/agentcore.schema.v1.json b/schemas/agentcore.schema.v1.json
index 8780a3ded..2e3c23fef 100644
--- a/schemas/agentcore.schema.v1.json
+++ b/schemas/agentcore.schema.v1.json
@@ -284,22 +284,76 @@
           "filesystemConfigurations": {
             "type": "array",
             "items": {
-              "type": "object",
-              "properties": {
-                "sessionStorage": {
+              "anyOf": [
+                {
                   "type": "object",
                   "properties": {
-                    "mountPath": {
-                      "type": "string",
-                      "pattern": "^\\/mnt\\/[^/]+$"
+                    "sessionStorage": {
+                      "type": "object",
+                      "properties": {
+                        "mountPath": {
+                          "type": "string",
+                          "minLength": 6,
+                          "maxLength": 200,
+                          "pattern": "^\\/mnt\\/[a-zA-Z0-9._-]+\\/?$"
+                        }
+                      },
+                      "required": ["mountPath"],
+                      "additionalProperties": false
                     }
                   },
-                  "required": ["mountPath"],
+                  "required": ["sessionStorage"],
+                  "additionalProperties": false
+                },
+                {
+                  "type": "object",
+                  "properties": {
+                    "efsAccessPoint": {
+                      "type": "object",
+                      "properties": {
+                        "accessPointArn": {
+                          "type": "string",
+                          "pattern": "^arn:aws[-a-z]*:elasticfilesystem:[a-z][a-z0-9-]*:[0-9]{12}:access-point\\/fsap-[0-9a-f]{8,40}$"
+                        },
+                        "mountPath": {
+                          "type": "string",
+                          "minLength": 6,
+                          "maxLength": 200,
+                          "pattern": "^\\/mnt\\/[a-zA-Z0-9._-]+\\/?$"
+                        }
+                      },
+                      "required": ["accessPointArn", "mountPath"],
+                      "additionalProperties": false
+                    }
+                  },
+                  "required": ["efsAccessPoint"],
+                  "additionalProperties": false
+                },
+                {
+                  "type": "object",
+                  "properties": {
+                    "s3FilesAccessPoint": {
+                      "type": "object",
+                      "properties": {
+                        "accessPointArn": {
+                          "type": "string",
+                          "pattern": "^arn:aws[-a-z]*:s3files:[a-z][a-z0-9-]*:[0-9]{12}:file-system\\/fs-[0-9a-f]{17,40}\\/access-point\\/fsap-[0-9a-f]{17,40}$"
+                        },
+                        "mountPath": {
+                          "type": "string",
+                          "minLength": 6,
+                          "maxLength": 200,
+                          "pattern": "^\\/mnt\\/[a-zA-Z0-9._-]+\\/?$"
+                        }
+                      },
+                      "required": ["accessPointArn", "mountPath"],
+                      "additionalProperties": false
+                    }
+                  },
+                  "required": ["s3FilesAccessPoint"],
                   "additionalProperties": false
                 }
-              },
-              "required": ["sessionStorage"],
-              "additionalProperties": false
+              ]
             }
           },
           "endpoints": {