diff --git a/group_vars/all/all.yml b/group_vars/all/all.yml
index 7de88c0dd3..d598b1af3e 100644
--- a/group_vars/all/all.yml
+++ b/group_vars/all/all.yml
@@ -49,13 +49,6 @@ repo_pkg_cache_port: 3142
 repo_pkg_cache_url: "http://{{ internal_lb_vip_address }}:{{ repo_pkg_cache_port }}"
 repo_release_path: "{{ openstack_repo_url }}/os-releases/{{ openstack_release }}/{{ os_distro_version }}"
 
-## kernel modules for specific group hosts
-# :param name: name of the kernel module
-# :param pattern: pattern to search for in /boot/config-$kernel_version to check how module is configured inside kernel
-# :param group: group of hosts where the module will be loaded
-openstack_host_specific_kernel_modules:
-  - { name: "ebtables", pattern: "CONFIG_BRIDGE_NF_EBTABLES", group: "network_hosts" }
-
 ## DNS resolution (resolvconf) options
 #Group containing resolvers to configure
 resolvconf_resolver_group: unbound
diff --git a/group_vars/network_hosts.yml b/group_vars/network_hosts.yml
new file mode 100644
index 0000000000..298bd21a7e
--- /dev/null
+++ b/group_vars/network_hosts.yml
@@ -0,0 +1,3 @@
+openstack_host_specific_kernel_modules:
+  - name: "ebtables"
+    pattern: "CONFIG_BRIDGE_NF_EBTABLES"
diff --git a/playbooks/lxc-containers-create.yml b/playbooks/lxc-containers-create.yml
index 03877b524a..b0d806d341 100644
--- a/playbooks/lxc-containers-create.yml
+++ b/playbooks/lxc-containers-create.yml
@@ -40,3 +40,15 @@
   environment: "{{ deployment_environment_variables | default({}) }}"
   tags:
     - lxc-containers-create
+
+- name: Configure containers default software
+  hosts: "{{ container_group|default('all_containers') }}"
+  gather_facts: true
+  user: root
+  roles:
+    - role: "openstack_hosts"
+  vars:
+    is_metal: "{{ properties.is_metal|default(false) }}"
+  environment: "{{ deployment_environment_variables | default({}) }}"
+  tags:
+    - lxc-containers-create