diff --git a/packages/b/bash/files/profile/50-history.sh b/packages/b/bash/files/profile/50-history.sh
index 2e6bba78735..72a91d2e43a 100644
--- a/packages/b/bash/files/profile/50-history.sh
+++ b/packages/b/bash/files/profile/50-history.sh
@@ -1,7 +1,10 @@
 # Begin /usr/share/defaults/etc/profile.d/50-history.sh
 
 # Append to history file on exit instead of overwrite (parallel terminals)
-shopt -s histappend
+# shopt is bash only
+if [ $SHELL = "/usr/bin/bash" ]; then
+    shopt -s histappend
+fi
 
 export HISTSIZE=1500
 export HISTIGNORE="&:[bf]g:exit"
diff --git a/packages/b/bash/files/profile/50-prompt.sh b/packages/b/bash/files/profile/50-prompt.sh
index ac7d4aa8b85..bbc64404ca0 100644
--- a/packages/b/bash/files/profile/50-prompt.sh
+++ b/packages/b/bash/files/profile/50-prompt.sh
@@ -16,7 +16,8 @@ unset FG
 unset BG
 unset AT
 unset HCOLOR
-if [ $SHELL != "/bin/zsh" ]; then
+# shopt is bash only
+if [ $SHELL = "/usr/bin/bash" ]; then
     shopt -s checkwinsize
 fi
 
diff --git a/packages/b/bash/files/profile/README.md b/packages/b/bash/files/profile/README.md
new file mode 100644
index 00000000000..c2a480dc6ba
--- /dev/null
+++ b/packages/b/bash/files/profile/README.md
@@ -0,0 +1,10 @@
+Files in this directory must have code that is POSIX compliant, since the file is loaded by all BOURNE compatible shells
+If you must use a bash-only function like shopt it must be put in a block that will load it only for bash
+
+e.g.
+
+```
+if [ $SHELL = "/usr/bin/bash" ]; then
+    shopt -s checkwinsize
+fi
+```
diff --git a/packages/b/bash/files/profile/profile b/packages/b/bash/files/profile/profile
index 5460d38457a..1fbfaca122b 100644
--- a/packages/b/bash/files/profile/profile
+++ b/packages/b/bash/files/profile/profile
@@ -19,14 +19,4 @@ if [ -d /etc/profile.d ] ; then
     unset script
 fi
 
-# User specific aliases and functions
-if [ -d ~/.bashrc.d ]; then
-    for rc in ~/.bashrc.d/*; do
-        if [ -f "$rc" ]; then
-            . "$rc"
-        fi
-    done
-    unset rc
-fi
-
 # End /usr/share/defaults/etc/profile
diff --git a/packages/b/bash/files/skel/.bashrc b/packages/b/bash/files/skel/.bashrc
index fad2b4be5e7..7242c115cb1 100644
--- a/packages/b/bash/files/skel/.bashrc
+++ b/packages/b/bash/files/skel/.bashrc
@@ -1 +1,11 @@
 source /usr/share/defaults/etc/profile
+
+# User specific bash aliases and functions
+if [ -d ~/.bashrc.d ]; then
+    for rc in ~/.bashrc.d/*; do
+        if [ -f "$rc" ]; then
+            . "$rc"
+        fi
+    done
+    unset rc
+fi
diff --git a/packages/b/bash/package.yml b/packages/b/bash/package.yml
index 816db12cd86..6e0b1ff151c 100644
--- a/packages/b/bash/package.yml
+++ b/packages/b/bash/package.yml
@@ -1,6 +1,6 @@
 name       : bash
 version    : 5.2.37
-release    : 84
+release    : 85
 source     :
     - https://ftp.gnu.org/gnu/bash/bash-5.2.37.tar.gz : 9599b22ecd1d5787ad7d3b7bf0c59f312b3396d1e281175dd1f8a4014da621ff
 license    :
diff --git a/packages/b/bash/pspec_x86_64.xml b/packages/b/bash/pspec_x86_64.xml
index 940e093769a..f0e8698eae6 100644
--- a/packages/b/bash/pspec_x86_64.xml
+++ b/packages/b/bash/pspec_x86_64.xml
@@ -3,8 +3,8 @@
         <Name>bash</Name>
         <Homepage>https://www.gnu.org/software/bash</Homepage>
         <Packager>
-            <Name>Reilly Brogan</Name>
-            <Email>solus@reillybrogan.com</Email>
+            <Name>Tracey Clark</Name>
+            <Email>traceyc.dev@tlcnet.info</Email>
         </Packager>
         <License>GPL-3.0-or-later</License>
         <PartOf>system.base</PartOf>
@@ -135,7 +135,7 @@
 </Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="84">bash</Dependency>
+            <Dependency release="85">bash</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/bash/alias.h</Path>
@@ -201,12 +201,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="84">
-            <Date>2024-10-18</Date>
+        <Update release="85">
+            <Date>2024-11-12</Date>
             <Version>5.2.37</Version>
             <Comment>Packaging update</Comment>
-            <Name>Reilly Brogan</Name>
-            <Email>solus@reillybrogan.com</Email>
+            <Name>Tracey Clark</Name>
+            <Email>traceyc.dev@tlcnet.info</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file
diff --git a/packages/z/zsh/files/zprofile b/packages/z/zsh/files/zprofile
index 79b93d0a12a..503a8c7e3bf 100644
--- a/packages/z/zsh/files/zprofile
+++ b/packages/z/zsh/files/zprofile
@@ -4,48 +4,5 @@ elif [ -f /etc/zsh/zprofile ]; then
     source /etc/zsh/zprofile
 fi
 
-# Source paths that may not be included by systemctl
-if [ -f /usr/share/defaults/etc/profile.d/10-path.sh ]; then
-    emulate sh -c 'source /usr/share/defaults/etc/profile.d/10-path.sh'
-fi
-
-# Source paths not included by systemctl necessary for XDG_DATA_DIRS
-
-if [ -f /usr/share/defaults/etc/profile.d/10-xdg.sh ]; then
-    emulate sh -c 'source /usr/share/defaults/etc/profile.d/10-xdg.sh'
-fi
-
-# Source paths not included by systemctl necessary for flatpaks to be found in the app menu and run
-
-if [ -f /usr/share/defaults/etc/profile.d/70-flatpak.sh ]; then
-    emulate sh -c 'source /usr/share/defaults/etc/profile.d/70-flatpak.sh'
-fi
-
-# Source paths not included by systemctl necessary for snaps to be found in the app menu and run
-
-if [ -f /usr/share/defaults/etc/profile.d/70-snapd.sh ]; then
-    emulate sh -c 'source /usr/share/defaults/etc/profile.d/70-snapd.sh'
-fi
-
-# Source gtk modules variable for menus
-
-if [ -f /usr/share/defaults/etc/profile.d/appmenu-gtk2-module.sh ]; then
-    emulate sh -c 'source /usr/share/defaults/etc/profile.d/appmenu-gtk2-module.sh'
-fi
-
-# Paths for gawk
-
-if [ -f /usr/share/defaults/etc/profile.d/gawk.sh ]; then
-    emulate sh -c 'source /usr/share/defaults/etc/profile.d/gawk.sh'
-fi
-
-# Environment for vte, zsh compatible
-
-if [ -f /usr/share/defaults/etc/profile.d/vte.sh ]; then
-    source /usr/share/defaults/etc/profile.d/vte.sh
-fi
-
-# Do not source /etc/profile as Arch does
-# This will source all other bash scripts in /etc/profile.d, some of which may not load properly.
-# Some may also conflict with zsh frameworks or have other unintended consequences
-# Additionally, Solus sources ~/.bashrc.d from /etc/profile which is not obvious to the user or expected in zsh
+# This should always be sourced regardless of the above files
+emulate sh -c 'source /usr/share/defaults/etc/profile'
diff --git a/packages/z/zsh/package.yml b/packages/z/zsh/package.yml
index 68cc153d115..66debcf9a45 100644
--- a/packages/z/zsh/package.yml
+++ b/packages/z/zsh/package.yml
@@ -1,6 +1,6 @@
 name       : zsh
 version    : '5.9'
-release    : 34
+release    : 35
 source     :
     - https://sourceforge.net/projects/zsh/files/zsh/5.9/zsh-5.9.tar.xz : 9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5
 homepage   : https://www.zsh.org/
diff --git a/packages/z/zsh/pspec_x86_64.xml b/packages/z/zsh/pspec_x86_64.xml
index 7d13879164a..cc7d0b16329 100644
--- a/packages/z/zsh/pspec_x86_64.xml
+++ b/packages/z/zsh/pspec_x86_64.xml
@@ -1397,8 +1397,8 @@
         </Files>
     </Package>
     <History>
-        <Update release="34">
-            <Date>2024-11-11</Date>
+        <Update release="35">
+            <Date>2024-11-12</Date>
             <Version>5.9</Version>
             <Comment>Packaging update</Comment>
             <Name>Tracey Clark</Name>