diff --git a/SPECS/filesystem.spec b/SPECS/filesystem.spec
index 75ed30f..16a222a 100644
--- a/SPECS/filesystem.spec
+++ b/SPECS/filesystem.spec
@@ -1,7 +1,7 @@
 Summary: The basic directory layout for a Linux system
 Name: filesystem
 Version: 3.8
-Release: 4%{?dist}.0.1
+Release: 6%{?dist}
 License: Public Domain
 URL: https://pagure.io/filesystem
 Group: System Environment/Base
@@ -153,6 +153,19 @@ posix.symlink("../.dwz", "/usr/lib/debug/usr/.dwz")
 posix.symlink("usr/sbin", "/usr/lib/debug/sbin")
 posix.symlink("usr/%{_lib}", "/%{_lib}")
 posix.mkdir("/run")
+posix.mkdir("/proc")
+posix.mkdir("/sys")
+
+st = posix.stat("/proc")
+if st and st.mode ~= 0555 then
+  posix.chmod("/proc", 0555)
+end
+
+st = posix.stat("/sys")
+if st and st.mode ~= 0555 then
+  posix.chmod("/sys", 0555)
+end
+
 st = posix.stat("/media")
 if st and st.type == "link" then
   os.remove("/media")
@@ -202,12 +215,12 @@ restorecon /media 2>/dev/null >/dev/null || :
 /media
 %dir /mnt
 %dir /opt
-%attr(555,root,root) /proc
+%ghost %attr(555,root,root) /proc
+%ghost %attr(555,root,root) /sys
 %attr(550,root,root) /root
 /run
 /sbin
 /srv
-%attr(555,root,root) /sys
 %attr(1777,root,root) /tmp
 %dir /usr
 %attr(555,root,root) /usr/bin
@@ -301,8 +314,9 @@ restorecon /media 2>/dev/null >/dev/null || :
 /var/yp
 
 %changelog
-* Thu Jun 03 2021 Carl George <carl@redhat.com> - 3.8-4.0.1
-- Manually revert 3.8-4 with positive release bump rhbz#1960739
+* Mon Jun 21 2021 Pavel Zhukov <pzhukov@redhat.com> - 3.8-6
+- Make /proc and /sys ghost to workaround issue in container
+- Revert restorecon change
 
 * Thu Apr 23 2020 Pavel Zhukov <pzhukov@redhat.com> - 3.8-4
 - Do not restore content of /proc (#1827087)