diff --git a/container-images/tcib/base/base.yaml b/container-images/tcib/base/base.yaml
index 1e0b1a464..a7fc74e2f 100644
--- a/container-images/tcib/base/base.yaml
+++ b/container-images/tcib/base/base.yaml
@@ -23,6 +23,7 @@ tcib_actions:
 - copy: /usr/share/tripleo-common/container-images/kolla/base/sudoers /etc/sudoers
 - run: chmod 440 /etc/sudoers
 - run: sed -ri '/-session(\s+)optional(\s+)pam_systemd.so/d' /etc/pam.d/system-auth
+- run: sed -ri '/^(passwd:|group:)/ s/systemd//g' /etc/nsswitch.conf
 - run: dnf install -y {{ tcib_packages['common'] | join(' ') }}
 - run: mkdir -p /openstack
 - run: dnf update -y && dnf clean all && rm -rf /var/cache/dnf