diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/pam/files/tmpfiles.d/pam.conf b/sdk_container/src/third_party/coreos-overlay/sys-libs/pam/files/tmpfiles.d/pam.conf
new file mode 100644
index 0000000000..d37448107c
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/pam/files/tmpfiles.d/pam.conf
@@ -0,0 +1,11 @@
+d /etc/pam.d			0755 root root	-	-
+d /etc/security			0755 root root	-	-
+d /etc/security/limits.d	0755 root root	-	-
+d /etc/security/namespace.d	0755 root root	-	-
+f /etc/environment		0755 root root	-	-	
+L /etc/security/access.conf	-    -	  -	-	../../usr/lib/pam/access.conf
+L /etc/security/group.conf	-    - 	  - 	-	../../usr/lib/pam/group.conf
+L /etc/security/limits.conf	-    -	  -	-	../../usr/lib/pam/limits.conf
+L /etc/security/namespace.conf	-    -	  -	-	../../usr/lib/pam/namespace.conf
+L /etc/security/pam_env.conf	-    -	  -	-	../../usr/lib/pam/pam_env.conf
+L /etc/security/time.conf	-    -	  -	-	../../usr/lib/pam/time.conf
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/pam/pam-1.5.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/pam/pam-1.5.1.ebuild
index 61ef08deb3..1ffa235a55 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-libs/pam/pam-1.5.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/pam/pam-1.5.1.ebuild
@@ -9,7 +9,7 @@ EAPI=7
 
 MY_P="Linux-${PN^^}-${PV}"
 
-inherit autotools db-use fcaps toolchain-funcs usr-ldscript multilib-minimal
+inherit autotools db-use fcaps toolchain-funcs multilib-minimal
 
 DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
 HOMEPAGE="https://github.com/linux-pam/linux-pam"
@@ -83,6 +83,7 @@ multilib_src_configure() {
 		$(use_enable pie)
 		$(use_enable selinux)
 		--enable-isadir='.' #464016
+		--enable-sconfigdir="/usr/lib/pam/"
 		)
 	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
@@ -94,8 +95,6 @@ multilib_src_compile() {
 multilib_src_install() {
 	emake DESTDIR="${D}" install \
 		sepermitlockdir="${EPREFIX}/run/sepermit"
-
-	gen_usr_ldscript -a pam pam_misc pamc
 }
 
 multilib_src_install_all() {
@@ -106,6 +105,8 @@ multilib_src_install_all() {
 
 	dodir /usr/lib/tmpfiles.d
 
+	rm "${D}/etc/environment"
+	cp "${FILESDIR}/tmpfiles.d/pam.conf" "${D}"/usr/lib/tmpfiles.d/${CATEGORY}-${PN}-config.conf
 	cat ->>  "${D}"/usr/lib/tmpfiles.d/${CATEGORY}-${PN}.conf <<-_EOF_
 		d /run/faillock 0755 root root
 	_EOF_