diff --git a/doc/source/reference/inventory/configure-inventory.rst b/doc/source/reference/inventory/configure-inventory.rst
index 51e3a29456..fd39e32296 100644
--- a/doc/source/reference/inventory/configure-inventory.rst
+++ b/doc/source/reference/inventory/configure-inventory.rst
@@ -221,12 +221,11 @@ To omit a component from a deployment, you can use one of several options:
 Deploying using a different container technology
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. note::
+.. warning::
 
    While nspawn is an available containerization technology it should be
-   considered experemental at this time. Even though this subsystem is not yet
-   recommended for production, it is stable enough to introduce to the community
-   and something we'd like feedback on as we improve it over the next cycle.
+   considered unmaintained and it's support will be removed in the upcoming
+   release.
 
 OpenStack-Ansible presently supports two different container technologies, LXC
 and nspawn. These two container technologies can be used separately or together
diff --git a/etc/openstack_deploy/openstack_user_config.yml.example b/etc/openstack_deploy/openstack_user_config.yml.example
index 4bcff965b6..09f75ae520 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.example
+++ b/etc/openstack_deploy/openstack_user_config.yml.example
@@ -321,7 +321,8 @@
 # List of target hosts on which to deploy shared infrastructure services
 # and define the container_tech for a specific infra node. If this setting
 # is omitted the inventory generation system will default to "lxc". Accpetable
-# options are "lxc" and "nspawn".
+# options are "lxc" and "nspawn". Please note, that nspawn is unmaintained
+# and will be removed in the upcoming release
 #
 #   Level: <value> (required, string)
 #   Hostname of a target host.
diff --git a/etc/openstack_deploy/openstack_user_config.yml.multibond.example b/etc/openstack_deploy/openstack_user_config.yml.multibond.example
index 2609e60926..5ed6f845c2 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.multibond.example
+++ b/etc/openstack_deploy/openstack_user_config.yml.multibond.example
@@ -94,14 +94,8 @@ global_overrides:
 shared-infra_hosts:
   infra1:
     ip: 172.29.236.11
-    container_vars:
-      # Optional | Example setting the container_tech for a target host.
-      container_tech: lxc
   infra2:
     ip: 172.29.236.12
-    container_vars:
-      # Optional | Example setting the container_tech for a target host.
-      container_tech: nspawn
   infra3:
     ip: 172.29.236.13
 
diff --git a/etc/openstack_deploy/openstack_user_config.yml.prod.example b/etc/openstack_deploy/openstack_user_config.yml.prod.example
index 3be0c78898..8a2e279aa5 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.prod.example
+++ b/etc/openstack_deploy/openstack_user_config.yml.prod.example
@@ -79,14 +79,8 @@ global_overrides:
 shared-infra_hosts:
   infra1:
     ip: 172.29.236.11
-    container_vars:
-      # Optional | Example setting the container_tech for a target host.
-      container_tech: lxc
   infra2:
     ip: 172.29.236.12
-    container_vars:
-      # Optional | Example setting the container_tech for a target host.
-      container_tech: nspawn
   infra3:
     ip: 172.29.236.13
 
diff --git a/etc/openstack_deploy/openstack_user_config.yml.provnet-group.example b/etc/openstack_deploy/openstack_user_config.yml.provnet-group.example
index 6d59d62014..1f6826adaf 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.provnet-group.example
+++ b/etc/openstack_deploy/openstack_user_config.yml.provnet-group.example
@@ -132,14 +132,8 @@ global_overrides:
 shared-infra_hosts:
   infra1:
     ip: 172.29.236.11
-    container_vars:
-      # Optional | Example setting the container_tech for a target host.
-      container_tech: lxc
   infra2:
     ip: 172.29.236.12
-    container_vars:
-      # Optional | Example setting the container_tech for a target host.
-      container_tech: nspawn
   infra3:
     ip: 172.29.236.13
 
diff --git a/etc/openstack_deploy/openstack_user_config.yml.singlebond.example b/etc/openstack_deploy/openstack_user_config.yml.singlebond.example
index f2f8020800..9ec44eba2b 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.singlebond.example
+++ b/etc/openstack_deploy/openstack_user_config.yml.singlebond.example
@@ -94,14 +94,8 @@ global_overrides:
 shared-infra_hosts:
   infra1:
     ip: 172.29.236.11
-    container_vars:
-      # Optional | Example setting the container_tech for a target host.
-      container_tech: lxc
   infra2:
     ip: 172.29.236.12
-    container_vars:
-      # Optional | Example setting the container_tech for a target host.
-      container_tech: nspawn
   infra3:
     ip: 172.29.236.13