diff --git a/scripts/helmcharts/init.sh b/scripts/helmcharts/init.sh
index 89bbc1465..386aa8823 100644
--- a/scripts/helmcharts/init.sh
+++ b/scripts/helmcharts/init.sh
@@ -119,7 +119,7 @@ function install_openreplay_actions() {
         sudo rm -rf $openreplay_code_dir
     fi
     sudo cp -rfb ./vars.yaml $openreplay_home_dir
-    sudo cp -rf "$(cd ../.. && pwd)" $openreplay_code_dir
+    sudo cp -rf "$(cd ../.. && pwd)" $openreplay_home_dir
 }
 
 function main() {
diff --git a/scripts/helmcharts/openreplay-cli b/scripts/helmcharts/openreplay-cli
index b246b5355..03f743fc7 100755
--- a/scripts/helmcharts/openreplay-cli
+++ b/scripts/helmcharts/openreplay-cli
@@ -203,6 +203,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)
@@ -385,7 +386,7 @@ 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
@@ -406,7 +407,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."