diff --git a/containers-registries.conf.5.md b/containers-registries.conf.5.md
index 0b90b60..fdc2fa9 100644
--- a/containers-registries.conf.5.md
+++ b/containers-registries.conf.5.md
@@ -43,7 +43,7 @@ also include wildcarded subdomains in the format `*.example.com`.
 The wildcard should only be present at the beginning as shown in the formats
 above. Other cases will not work. For example, `*.example.com` is valid but
 `example.*.com`, `*.example.com/foo` and `*.example.com:5000/foo/bar:baz` are not.
-Note that `*` matches an arbitary number of subdomains. `*.example.com` will hence
+Note that `*` matches an arbitrary number of subdomains. `*.example.com` will hence
 match `bar.example.com`, `foo.bar.example.com` and so on.
 
 As a special case, the `prefix` field can be missing; if so, it defaults to the value
diff --git a/containers.conf b/containers.conf
index 52ea4ed..8a60b87 100644
--- a/containers.conf
+++ b/containers.conf
@@ -434,6 +434,16 @@ log_driver = "journald"
 #
 #image_parallel_copies = 0
 
+# Tells container engines how to handle the builtin image volumes.
+#   * bind: An anonymous named volume will be created and mounted
+#     into the container.
+#   * tmpfs: The volume is mounted onto the container as a tmpfs,
+#     which allows users to create content that disappears when
+#     the container is stopped.
+#   * ignore: All volumes are just ignored and no action is taken.
+#
+#image_volume_mode = ""
+
 # Default command to run the infra container
 #
 #infra_command = "/pause"
diff --git a/containers.conf.5.md b/containers.conf.5.md
index 27f696b..a99c179 100644
--- a/containers.conf.5.md
+++ b/containers.conf.5.md
@@ -487,6 +487,14 @@ Default transport method for pulling and pushing images.
 Maximum number of image layers to be copied (pulled/pushed) simultaneously.
 Not setting this field will fall back to containers/image defaults. (6)
 
+**image_volume_mode**="bind"
+
+Tells container engines how to handle the builtin image volumes.
+
+* bind: An anonymous named volume will be  created  and  mounted into the container.
+* tmpfs: The volume is mounted onto the container as a tmpfs, which allows the users to create content that disappears when the container is stopped.
+* ignore: All volumes are just ignored and no action is taken.
+
 **infra_command**="/pause"
 
 Infra (pause) container image command for pod infra containers. When running a
diff --git a/shortnames.conf b/shortnames.conf
index 56f772d..4dfba37 100644
--- a/shortnames.conf
+++ b/shortnames.conf
@@ -73,6 +73,9 @@
   "ubi8/ubi-minimal" = "registry.access.redhat.com/ubi8-minimal"
   "ubi8/ubi-init" = "registry.access.redhat.com/ubi8-init"
   "ubi8/ubi-micro" = "registry.access.redhat.com/ubi8-micro"
+  "ubi8/podman" = "registry.access.redhat.com/ubi8/podman"
+  "ubi8/buildah" = "registry.access.redhat.com/ubi8/buildah"
+  "ubi8/skopeo" = "registry.access.redhat.com/ubi8/skopeo"
   "rhel9" = "registry.access.redhat.com/ubi9"
   "rhel9-init" = "registry.access.redhat.com/ubi9-init"
   "rhel9-minimal" = "registry.access.redhat.com/ubi9-minimal"
@@ -85,6 +88,9 @@
   "ubi9/ubi-minimal" = "registry.access.redhat.com/ubi9-minimal"
   "ubi9/ubi-init" = "registry.access.redhat.com/ubi9-init"
   "ubi9/ubi-micro" = "registry.access.redhat.com/ubi9-micro"
+  "ubi9/podman" = "registry.access.redhat.com/ubi9/podman"
+  "ubi9/buildah" = "registry.access.redhat.com/ubi9/buildah"
+  "ubi9/skopeo" = "registry.access.redhat.com/ubi9/skopeo"
   # Rocky Linux
   "rockylinux" = "docker.io/library/rockylinux"
   # Debian