diff --git a/dist/pacman.sh b/dist/pacman.sh
index 95ca188..95e41c0 100755
--- a/dist/pacman.sh
+++ b/dist/pacman.sh
@@ -73,9 +73,6 @@ else
     yes | su - "$BUILD_USER" -c "paru -S --noconfirm ${paru_packages[*]}"
     yes | su - "$BUILD_USER" -c "yes | sdkmanager --licenses"
     yes | su - "$BUILD_USER" -c "yes | sudo pacman -Syu --noconfirm gradle"
-    yes | su - "$BUILD_USER" -c "dist/init_rc.sh"
-    # check if bashrc or zshrc contains sdkman initialization, if not add it
 fi
 
-
 echo "All packages installed successfully."
diff --git a/setup.sh b/setup.sh
index c677cc3..bf056ff 100755
--- a/setup.sh
+++ b/setup.sh
@@ -25,6 +25,10 @@ case "$DISTRO" in
         ;;
 esac
 
+# Initialize shell configuration
+echo "Initializing shell configuration..."
+bash dist/init_rc.sh
+
 echo "Setup completed."