diff --git a/defaults/main.yml b/defaults/main.yml
index 4dbd781c..6c4f2fcd 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -24,7 +24,7 @@ openstack_distrib_description: "OpenStack-Ansible"
 openstack_distrib_file: yes
 openstack_distrib_file_path: "/etc/openstack-release"
 
-is_container: "{{ ansible_virtualization_type == 'lxc' }}"
+is_container: "{{ ansible_virtualization_type in ['lxc', 'systemd-nspawn'] }}"
 
 openstack_host_sysstat_enabled: true
 openstack_host_sysstat_interval: 1
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index 4ba31f3a..9dfd20e7 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -13,9 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-## APT Cache Options
-cache_timeout: 600
-
 ## Defined required kernel
 openstack_host_required_kernel: 4.4.0-0-generic
 openstack_host_sysstat_file: /etc/default/sysstat
diff --git a/vars/ubuntu-18.04.yml b/vars/ubuntu-18.04.yml
index a5286ed7..d4f2f9c9 100644
--- a/vars/ubuntu-18.04.yml
+++ b/vars/ubuntu-18.04.yml
@@ -13,9 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-## APT Cache Options
-cache_timeout: 600
-
 ## Defined required kernel
 openstack_host_required_kernel: 4.15.0-0-generic
 openstack_host_sysstat_file: /etc/default/sysstat