diff --git a/modules.d/99base/rdsosreport.sh b/modules.d/99base/rdsosreport.sh
index 3e2ac87d..639b4e4b 100755
--- a/modules.d/99base/rdsosreport.sh
+++ b/modules.d/99base/rdsosreport.sh
@@ -6,18 +6,18 @@ echo 'Generating "/run/initramfs/rdsosreport.txt"'
 
 exec >/run/initramfs/rdsosreport.txt 2>&1
 
+PWFILTER='s/\(ftp:\/\/.*\):.*@/\1:*******@/g;s/\(cifs:\/\/.*\):.*@/\1:*******@/g;s/cifspass=[^ ]*/cifspass=*******/g;s/iscsi:.*@/iscsi:******@/g;s/rd.iscsi.password=[^ ]*/rd.iscsi.password=******/g;s/rd.iscsi.in.password=[^ ]*/rd.iscsi.in.password=******/g'
 set -x
-
 cat /lib/dracut/dracut-*
 
-cat /proc/cmdline
+cat /proc/cmdline | sed -e "$PWFILTER"
 
-[ -f /etc/cmdline ] && cat /etc/cmdline
+[ -f /etc/cmdline ] && cat /etc/cmdline | sed -e "$PWFILTER"
 
 for _i in /etc/cmdline.d/*.conf; do
     [ -f "$_i" ] || break
     echo $_i
-    cat $_i
+    cat $_i | sed -e "$PWFILTER"
 done
 
 cat /proc/self/mountinfo
@@ -31,7 +31,7 @@ ls -l /dev/disk/by*
 for _i in /etc/conf.d/*.conf; do
     [ -f "$_i" ] || break
     echo $_i
-    cat $_i
+    cat $_i | sed -e "$PWFILTER"
 done
 
 if command -v lvm >/dev/null 2>/dev/null; then
@@ -47,9 +47,9 @@ cat /proc/mdstat
 command -v ip >/dev/null 2>/dev/null && ip addr
 
 if command -v journalctl >/dev/null 2>/dev/null; then
-    journalctl -ab --no-pager -o short-monotonic
+    journalctl -ab --no-pager -o short-monotonic | sed -e "$PWFILTER"
 else
-    dmesg
-    [ -f /run/initramfs/init.log ] && cat /run/initramfs/init.log
+    dmesg | sed -e "$PWFILTER"
+    [ -f /run/initramfs/init.log ] && cat /run/initramfs/init.log | sed -e "$PWFILTER"
 fi