diff --git a/internal/manifest/commit_deployment.go b/internal/manifest/commit_deployment.go
index ef3fbcdc2..74a12ebc3 100644
--- a/internal/manifest/commit_deployment.go
+++ b/internal/manifest/commit_deployment.go
@@ -160,6 +160,7 @@ func (p *OSTreeDeployment) serialize() osbuild.Pipeline {
 			Keymap: p.Keyboard,
 		}
 		keymapStage := osbuild.NewKeymapStage(options)
+		keymapStage.MountOSTree(p.osName, p.osTreeRef, 0)
 		pipeline.AddStage(keymapStage)
 	}
 
@@ -168,6 +169,7 @@ func (p *OSTreeDeployment) serialize() osbuild.Pipeline {
 			Language: p.Locale,
 		}
 		localeStage := osbuild.NewLocaleStage(options)
+		localeStage.MountOSTree(p.osName, p.osTreeRef, 0)
 		pipeline.AddStage(localeStage)
 	}
 
diff --git a/test/data/manifests/fedora_35-aarch64-fedora_iot_raw_image-boot.json b/test/data/manifests/fedora_35-aarch64-fedora_iot_raw_image-boot.json
index 8cc84bbce..39c490df5 100644
--- a/test/data/manifests/fedora_35-aarch64-fedora_iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-fedora_iot_raw_image-boot.json
@@ -1897,13 +1897,39 @@
             "type": "org.osbuild.keymap",
             "options": {
               "keymap": "us"
-            }
+            },
+            "mounts": [
+              {
+                "name": "ostree-test/fedora/iot",
+                "type": "org.osbuild.ostree.deployment",
+                "options": {
+                  "deployment": {
+                    "osname": "fedora-iot",
+                    "ref": "test/fedora/iot",
+                    "serial": 0
+                  }
+                }
+              }
+            ]
           },
           {
             "type": "org.osbuild.locale",
             "options": {
               "language": "C.UTF-8"
-            }
+            },
+            "mounts": [
+              {
+                "name": "ostree-test/fedora/iot",
+                "type": "org.osbuild.ostree.deployment",
+                "options": {
+                  "deployment": {
+                    "osname": "fedora-iot",
+                    "ref": "test/fedora/iot",
+                    "serial": 0
+                  }
+                }
+              }
+            ]
           },
           {
             "type": "org.osbuild.grub2",
diff --git a/test/data/manifests/fedora_35-x86_64-fedora_iot_raw_image-boot.json b/test/data/manifests/fedora_35-x86_64-fedora_iot_raw_image-boot.json
index bcda411c1..53481fef2 100644
--- a/test/data/manifests/fedora_35-x86_64-fedora_iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_35-x86_64-fedora_iot_raw_image-boot.json
@@ -1921,13 +1921,39 @@
             "type": "org.osbuild.keymap",
             "options": {
               "keymap": "us"
-            }
+            },
+            "mounts": [
+              {
+                "name": "ostree-test/fedora/iot",
+                "type": "org.osbuild.ostree.deployment",
+                "options": {
+                  "deployment": {
+                    "osname": "fedora-iot",
+                    "ref": "test/fedora/iot",
+                    "serial": 0
+                  }
+                }
+              }
+            ]
           },
           {
             "type": "org.osbuild.locale",
             "options": {
               "language": "C.UTF-8"
-            }
+            },
+            "mounts": [
+              {
+                "name": "ostree-test/fedora/iot",
+                "type": "org.osbuild.ostree.deployment",
+                "options": {
+                  "deployment": {
+                    "osname": "fedora-iot",
+                    "ref": "test/fedora/iot",
+                    "serial": 0
+                  }
+                }
+              }
+            ]
           },
           {
             "type": "org.osbuild.grub2",
diff --git a/test/data/manifests/fedora_36-aarch64-fedora_iot_raw_image-boot.json b/test/data/manifests/fedora_36-aarch64-fedora_iot_raw_image-boot.json
index 0be635744..0c238be29 100644
--- a/test/data/manifests/fedora_36-aarch64-fedora_iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_36-aarch64-fedora_iot_raw_image-boot.json
@@ -2145,13 +2145,39 @@
             "type": "org.osbuild.keymap",
             "options": {
               "keymap": "us"
-            }
+            },
+            "mounts": [
+              {
+                "name": "ostree-test/fedora/iot",
+                "type": "org.osbuild.ostree.deployment",
+                "options": {
+                  "deployment": {
+                    "osname": "fedora-iot",
+                    "ref": "test/fedora/iot",
+                    "serial": 0
+                  }
+                }
+              }
+            ]
           },
           {
             "type": "org.osbuild.locale",
             "options": {
               "language": "C.UTF-8"
-            }
+            },
+            "mounts": [
+              {
+                "name": "ostree-test/fedora/iot",
+                "type": "org.osbuild.ostree.deployment",
+                "options": {
+                  "deployment": {
+                    "osname": "fedora-iot",
+                    "ref": "test/fedora/iot",
+                    "serial": 0
+                  }
+                }
+              }
+            ]
           },
           {
             "type": "org.osbuild.grub2",
diff --git a/test/data/manifests/fedora_36-x86_64-fedora_iot_raw_image-boot.json b/test/data/manifests/fedora_36-x86_64-fedora_iot_raw_image-boot.json
index 34da7c2b6..32e2a6e81 100644
--- a/test/data/manifests/fedora_36-x86_64-fedora_iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_36-x86_64-fedora_iot_raw_image-boot.json
@@ -2169,13 +2169,39 @@
             "type": "org.osbuild.keymap",
             "options": {
               "keymap": "us"
-            }
+            },
+            "mounts": [
+              {
+                "name": "ostree-test/fedora/iot",
+                "type": "org.osbuild.ostree.deployment",
+                "options": {
+                  "deployment": {
+                    "osname": "fedora-iot",
+                    "ref": "test/fedora/iot",
+                    "serial": 0
+                  }
+                }
+              }
+            ]
           },
           {
             "type": "org.osbuild.locale",
             "options": {
               "language": "C.UTF-8"
-            }
+            },
+            "mounts": [
+              {
+                "name": "ostree-test/fedora/iot",
+                "type": "org.osbuild.ostree.deployment",
+                "options": {
+                  "deployment": {
+                    "osname": "fedora-iot",
+                    "ref": "test/fedora/iot",
+                    "serial": 0
+                  }
+                }
+              }
+            ]
           },
           {
             "type": "org.osbuild.grub2",
diff --git a/test/data/manifests/fedora_37-aarch64-fedora_iot_raw_image-boot.json b/test/data/manifests/fedora_37-aarch64-fedora_iot_raw_image-boot.json
index 26bad4b90..c9f8051d9 100644
--- a/test/data/manifests/fedora_37-aarch64-fedora_iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_37-aarch64-fedora_iot_raw_image-boot.json
@@ -2153,13 +2153,39 @@
             "type": "org.osbuild.keymap",
             "options": {
               "keymap": "us"
-            }
+            },
+            "mounts": [
+              {
+                "name": "ostree-test/fedora/iot",
+                "type": "org.osbuild.ostree.deployment",
+                "options": {
+                  "deployment": {
+                    "osname": "fedora-iot",
+                    "ref": "test/fedora/iot",
+                    "serial": 0
+                  }
+                }
+              }
+            ]
           },
           {
             "type": "org.osbuild.locale",
             "options": {
               "language": "C.UTF-8"
-            }
+            },
+            "mounts": [
+              {
+                "name": "ostree-test/fedora/iot",
+                "type": "org.osbuild.ostree.deployment",
+                "options": {
+                  "deployment": {
+                    "osname": "fedora-iot",
+                    "ref": "test/fedora/iot",
+                    "serial": 0
+                  }
+                }
+              }
+            ]
           },
           {
             "type": "org.osbuild.grub2",
diff --git a/test/data/manifests/fedora_37-x86_64-fedora_iot_raw_image-boot.json b/test/data/manifests/fedora_37-x86_64-fedora_iot_raw_image-boot.json
index db246dd2a..91d5b8b6d 100644
--- a/test/data/manifests/fedora_37-x86_64-fedora_iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_37-x86_64-fedora_iot_raw_image-boot.json
@@ -2177,13 +2177,39 @@
             "type": "org.osbuild.keymap",
             "options": {
               "keymap": "us"
-            }
+            },
+            "mounts": [
+              {
+                "name": "ostree-test/fedora/iot",
+                "type": "org.osbuild.ostree.deployment",
+                "options": {
+                  "deployment": {
+                    "osname": "fedora-iot",
+                    "ref": "test/fedora/iot",
+                    "serial": 0
+                  }
+                }
+              }
+            ]
           },
           {
             "type": "org.osbuild.locale",
             "options": {
               "language": "C.UTF-8"
-            }
+            },
+            "mounts": [
+              {
+                "name": "ostree-test/fedora/iot",
+                "type": "org.osbuild.ostree.deployment",
+                "options": {
+                  "deployment": {
+                    "osname": "fedora-iot",
+                    "ref": "test/fedora/iot",
+                    "serial": 0
+                  }
+                }
+              }
+            ]
           },
           {
             "type": "org.osbuild.grub2",