diff --git a/shell/.profile b/shell/.profile
index 76d601c..c302a48 100644
--- a/shell/.profile
+++ b/shell/.profile
@@ -33,6 +33,9 @@ if isMac; then
         eval "$(/opt/homebrew/bin/brew shellenv zsh)"
         addPath "/opt/homebrew/bin/"
 
+        # java
+        export JAVA_HOME="/Library/Java/JavaVirtualMachines/openjdk-17.jdk/Contents/Home"
+
         # nvm (not nvim!)
         safeSource "/opt/homebrew/opt/nvm/nvm.sh"  # This loads nvm
         safeSource "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm"  # This loads nvm bash_completion
@@ -50,12 +53,10 @@ fi
 if isLinux; then
     # golang
     export PATH="$PATH:/usr/local/go/bin"
-    # export GOPATH="$HOME/.go"
 
     # java
     # export JAVA_HOME="/usr/lib/jvm/java-21-openjdk-amd64"
     export JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64"
-    export PATH="$JAVA_HOME/bin/:$PATH"
 
     # nvim (not nvm!)
     [ -d "/opt/nvim/bin/" ] && export PATH="$PATH:/opt/nvim/bin/"
@@ -78,10 +79,10 @@ if isLinux; then
     # [ -f $HOME/.phpbrew/bashrc ] && source $HOME/.phpbrew/bashrc
 
     # The next line updates PATH for Yandex Cloud CLI.
-    [ -f "$HOME/yandex-cloud/path.bash.inc" ] && source "$HOME/yandex-cloud/path.bash.inc"
+    safeSource "$HOME/yandex-cloud/path.bash.inc"
 
     # The next line enables shell command completion for yc.
-    [ -f "$HOME/yandex-cloud/completion.zsh.inc" ] && source "$HOME/yandex-cloud/completion.zsh.inc"
+    safeSource "$HOME/yandex-cloud/completion.zsh.inc"
 
     # jbtoolbox
     if [ -d "$HOME/.local/share/JetBrains/Toolbox/scripts/" ]; then
@@ -90,4 +91,6 @@ if isLinux; then
 fi
 ### Ubuntu section end
 
+addPath "$JAVA_HOME/bin/"
+
 safeSource "$HOME/.profile.local"