diff --git a/scripts/helmcharts/init.sh b/scripts/helmcharts/init.sh
index fb7687a34..a1a461632 100644
--- a/scripts/helmcharts/init.sh
+++ b/scripts/helmcharts/init.sh
@@ -110,16 +110,16 @@ function install_openreplay_actions() {
     sudo cp -f openreplay-cli /bin/openreplay
     install_openreplay
 
-    local openreplay_dir="/var/lib/openreplay/openreplay"
-    if [[ -d $openreplay_dir ]]; then
+    local openreplay_code_dir="/var/lib/openreplay/openreplay"
+    local openreplay_home_dir="/var/lib/openreplay"
+    if [[ -d $openreplay_code_dir ]]; then
         local versions_file="/var/lib/openreplay/or_versions.txt"
         date +%m-%d-%Y-%H%M%S | sudo tee -a $versions_file
         sudo git log -1 2>&1 | sudo tee -a $versions_file
-        sudo rm -rf $openreplay_dir
+        sudo rm -rf $openreplay_code_dir
     fi
-    sudo mkdir -p $openreplay_dir
-    sudo cp -rfb ./vars.yaml $openreplay_dir/../
-    sudo cp -rf "$(cd ../.. && pwd)" $openreplay_dir
+    sudo cp -rfb ./vars.yaml $openreplay_home_dir
+    sudo cp -rf "$(cd ../.. && pwd)" $openreplay_home_dir
 }
 
 function main() {
diff --git a/scripts/helmcharts/openreplay-cli b/scripts/helmcharts/openreplay-cli
index e0e99525e..1330ffe07 100755
--- a/scripts/helmcharts/openreplay-cli
+++ b/scripts/helmcharts/openreplay-cli
@@ -190,6 +190,7 @@ function status() {
     return
 }
 
+# Create OR version patch with gith sha
 function patch_version() {
     # Patching config version for console
     version=$(/var/lib/openreplay/yq '.fromVersion' vars.yaml)-$(sudo git rev-parse --short HEAD)
@@ -369,15 +370,15 @@ function upgrade() {
 
     time_now=$(date +%m-%d-%Y-%I%M%S)
     # Creating backup dir of current installation
-    [[ -d "$OR_DIR/openreplay" ]] && sudo mv "$OR_DIR/openreplay" "$OR_DIR/openreplay_${or_version//\"/}_${time_now}"
+    [[ -d "$OR_DIR/openreplay" ]] && sudo cp -rf "$OR_DIR/openreplay" "$OR_DIR/openreplay_${or_version//\"/}_${time_now}"
 
     clone_repo
     err_cd openreplay/scripts/helmcharts
     install_packages
     [[ -d /openreplay ]] && sudo chown -R 1001:1001 /openreplay
 
-    # Merge prefrerences
-    cp $OR_DIR/vars.yaml old_vars.yaml
+    # Merge preferences
+    cp "$OR_DIR/vars.yaml" old_vars.yaml
     or_new_version=$(awk '/fromVersion/{print $2}' <"vars.yaml")
     yq '(load("old_vars.yaml") | .. | select(tag != "!!map" and tag != "!!seq")) as $i ireduce(.; setpath($i | path; $i))' vars.yaml >new_vars.yaml
     mv new_vars.yaml vars.yaml
@@ -389,7 +390,8 @@ function upgrade() {
     sudo mv ./openreplay-cli /bin/openreplay
     sudo chmod +x /bin/openreplay
     sudo mv ./vars.yaml "$OR_DIR"
-    sudo cp -rf ../../../openreplay $OR_DIR/
+    sudo rm -rf "$OR_DIR/openreplay" || true
+    sudo cp -rf "${tmp_dir}/openreplay" "$OR_DIR/"
     log info "Configuration file is saved in /var/lib/openreplay/vars.yaml"
     log info "Run ${BWHITE}openreplay -h${GREEN} to see the cli information to manage OpenReplay."