diff --git a/src/content/docs/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/index.mdx b/src/content/docs/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/index.mdx
index a37fb62f525a2db..5d77fd2b867ba55 100644
--- a/src/content/docs/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/index.mdx
+++ b/src/content/docs/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/index.mdx
@@ -24,7 +24,7 @@ This page provides generic instructions for an automated deployment. If you want
## Windows
-The WARP Client for Windows allows for an automated install via tools like Intune, AD, or any script or management tool that can execute a `.msi` file.
+The WARP client for Windows allows for an automated install via tools like Intune, AD, or any script or management tool that can execute a `.msi` file.
### Install WARP
@@ -89,33 +89,42 @@ The WARP client will now launch WebView2 when the user is registering their devi
## macOS
-The Cloudflare WARP macOS client allows for an automated install via tools like Jamf, Intune, Kandji, or JumpCloud or any script or management tool that can place a `com.cloudflare.warp.plist` file in `/Library/Managed Preferences` on a supported macOS device. Additionally this plist can be wrapped in a `.mobileconfig`.
+The WARP client for macOS allows for an automated install via tools like Jamf, Intune, Kandji, or JumpCloud or any script or management tool that can place a `com.cloudflare.warp.plist` file in `/Library/Managed Preferences`. The plist can also be wrapped in a `.mobileconfig`.
-### Create `plist` file
+If you do not wish to use a management tool, you can manually place an `mdm.xml` file in `/Library/Application Support/Cloudflare`.
-1. [Download](/cloudflare-one/static/mdm/com.cloudflare.warp.plist) an example `com.cloudflare.warp.plist` file.
-
-2. Modify the file with your desired [deployment arguments](/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/parameters/).
+### Prepare file for MDM deployment
-3. (Optional) If you want to manually place the file in `/Library/Managed Preferences` (rather than use a management tool), convert the `plist` into binary format:
+#### `plist` file
-```sh
-plutil -convert binary1 com.cloudflare.warp.plist
-```
+1. [Download](/cloudflare-one/static/mdm/com.cloudflare.warp.plist) an example `com.cloudflare.warp.plist` file.
-The plist must be pushed by an MDM tool in order to persist after reboot. Manually-placed files will be automatically deleted by the OS.
+2. Modify the file with your desired [deployment parameters](/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/parameters/).
-### Create `mobileconfig` file
+#### `mobileconfig` file
1. [Download](/cloudflare-one/static/mdm/CloudflareWARP.mobileconfig) an example `.mobileconfig` file.
2. Run `uuidgen` from your macOS Terminal. This will generate a value for `PayloadUUID`, which you can use to replace the default value used for `PayloadUUID`.
-3. Modify the file with your desired [deployment arguments](/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/parameters/).
+3. Modify the file with your desired [deployment parameters](/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/parameters/).
+
+### Place an unmanaged `mdm.xml` file
+
+You can configure [WARP deployment parameters](/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/parameters/) on macOS by manually placing an `mdm.xml` file in `/Library/Application Support/Cloudflare`. This deployment method is an alternative to pushing a `plist` or `mobileconfig` using an MDM tool.
+
+The format of `/Library/Application Support/Cloudflare/mdm.xml` is as follows:
+
+```xml
+
+ organization
+ your-team-name
+
+```
## Linux
-The WARP Client for Linux allows for an automated install via the presence of an `mdm.xml` file in `/var/lib/cloudflare-warp`.
+The WARP client for Linux allows for an automated install via the presence of an `mdm.xml` file in `/var/lib/cloudflare-warp`.
The format of `/var/lib/cloudflare-warp/mdm.xml` is as follows:
diff --git a/src/content/docs/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/switch-organizations.mdx b/src/content/docs/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/switch-organizations.mdx
index a12955354bb4bb3..0006d331801c7e6 100644
--- a/src/content/docs/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/switch-organizations.mdx
+++ b/src/content/docs/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/switch-organizations.mdx
@@ -39,11 +39,9 @@ To enable multiple organizations, administrators need to modify their [MDM file]
An MDM file supports a maximum of 25 configurations. The following example includes three configurations.
-
+### XML
-
-
-```xml
+```xml title="mdm.xml"
configs
@@ -75,56 +73,14 @@ An MDM file supports a maximum of 25 configurations. The following example inclu
```
-
-
-
-
-**plist**
+### plist
-[Download](/cloudflare-one/static/mdm/multiple-orgs/com.cloudflare.warp.plist) an example `.plist` file. If placing the file manually, be sure to [convert the file into binary format](/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/#create-plist-file).
+[Download](/cloudflare-one/static/mdm/multiple-orgs/com.cloudflare.warp.plist) an example `.plist` file.
-**mobileconfig**
+### mobileconfig
[Download](/cloudflare-one/static/mdm/multiple-orgs/CloudflareWARP.mobileconfig) an example `.mobileconfig` file.
-
-
-
-
-```xml
-
- configs
-
-
- organization
- mycompany
- display_name
- Production environment
-
-
- organization
- mycompany
- override_api_endpoint
- 203.0.113.0
- override_doh_endpoint
- 203.0.113.0
- override_warp_endpoint
- 203.0.113.0:0
- display_name
- China employees
-
-
- organization
- test-org
- display_name
- Test environment
-
-
-
-```
-
-
-
## Switch organizations in WARP