diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf
index 5b968c1..a654a55 100644
--- a/meta-ibm/conf/machine/p10bmc.conf
+++ b/meta-ibm/conf/machine/p10bmc.conf
@@ -25,6 +25,7 @@
 require conf/distro/include/openpower-hostfw-over-pldm.inc
 require conf/distro/include/ibm-mpreboot.inc
 require conf/distro/include/ibm-yaml.inc
+require conf/distro/include/google-authenticator-libpam.inc
 include conf/distro/include/extra-dev-debug-tools.inc
 DISTRO_FEATURES += "ibm-service-account-policy"
 MACHINE_FEATURES += "phal tpm2"
diff --git a/meta-ibm/conf/templates/default/bblayers.conf.sample b/meta-ibm/conf/templates/default/bblayers.conf.sample
index 9ce1053..bcaad7b 100644
--- a/meta-ibm/conf/templates/default/bblayers.conf.sample
+++ b/meta-ibm/conf/templates/default/bblayers.conf.sample
@@ -11,6 +11,7 @@
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-perl \
   ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-security \
   ##OEROOT##/meta-security/meta-tpm \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-aspeed \
diff --git a/meta-phosphor/conf/distro/include/google-authenticator-libpam.inc b/meta-phosphor/conf/distro/include/google-authenticator-libpam.inc
new file mode 100644
index 0000000..9b023c4
--- /dev/null
+++ b/meta-phosphor/conf/distro/include/google-authenticator-libpam.inc
@@ -0,0 +1,2 @@
+DISTRO_FEATURES += "google-authenticator-libpam"
+DISTROOVERRIDES .= ":df-google-authenticator-libpam"
diff --git a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb
index d821ebc..b7d9c0f 100644
--- a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb
@@ -43,6 +43,7 @@
 "
 
 USERADD_PACKAGES = "${PN} phosphor-ldap"
+RDEPENDS:${PN}:append:df-google-authenticator-libpam = " pam-google-authenticator google-authenticator-libpam"
 
 PACKAGE_BEFORE_PN = "phosphor-ldap"
 DBUS_PACKAGES = "${USERADD_PACKAGES}"