diff --git a/ct/tolgee.sh b/ct/tolgee.sh
index e314086d..fe8be6ed 100644
--- a/ct/tolgee.sh
+++ b/ct/tolgee.sh
@@ -34,30 +34,9 @@ function update_script() {
     systemctl stop tolgee
     msg_ok "Stopped Service"
 
-    msg_info "Backing up Data"
-    if [[ -f /opt/tolgee/.env ]]; then
-      cp /opt/tolgee/.env /opt/tolgee.env.bak
-    fi
-    if [[ -d /opt/tolgee/data ]]; then
-      cp -r /opt/tolgee/data /opt/tolgee_data_backup
-    fi
-    msg_ok "Backed up Data"
-
     CLEAN_INSTALL=1 fetch_and_deploy_gh_release "tolgee" "tolgee/tolgee-platform" "singlefile" "latest" "/opt/tolgee" "tolgee-*.jar"
-
     find /opt/tolgee -maxdepth 1 -type f -name 'tolgee-*.jar' -exec mv {} /opt/tolgee/tolgee.jar \;
 
-    msg_info "Restoring Data"
-    if [[ -f /opt/tolgee.env.bak ]]; then
-      cp /opt/tolgee.env.bak /opt/tolgee/.env
-      rm -f /opt/tolgee.env.bak
-    fi
-    if [[ -d /opt/tolgee_data_backup ]]; then
-      cp -r /opt/tolgee_data_backup/. /opt/tolgee/data
-      rm -rf /opt/tolgee_data_backup
-    fi
-    msg_ok "Restored Data"
-
     msg_info "Starting Service"
     systemctl start tolgee
     msg_ok "Started Service"
diff --git a/install/tolgee-install.sh b/install/tolgee-install.sh
index d5b30af7..4e791c8b 100644
--- a/install/tolgee-install.sh
+++ b/install/tolgee-install.sh
@@ -20,10 +20,10 @@ PG_DB_NAME="tolgee" PG_DB_USER="tolgee" setup_postgresql_db
 fetch_and_deploy_gh_release "tolgee" "tolgee/tolgee-platform" "singlefile" "latest" "/opt/tolgee" "tolgee-*.jar"
 
 msg_info "Setting up Tolgee"
-mkdir -p /opt/tolgee/data
+mkdir -p /opt/tolgee_data
 find /opt/tolgee -maxdepth 1 -type f -name 'tolgee-*.jar' -exec mv {} /opt/tolgee/tolgee.jar \;
 
-cat <<EOF >/opt/tolgee/.env
+cat <<EOF >/opt/tolgee_data/.env
 SERVER_PORT=8080
 TOLGEE_POSTGRES_AUTOSTART_ENABLED=false
 SPRING_DATASOURCE_URL=jdbc:postgresql://localhost:5432/${PG_DB_NAME}
@@ -31,7 +31,7 @@ SPRING_DATASOURCE_USERNAME=${PG_DB_USER}
 SPRING_DATASOURCE_PASSWORD=${PG_DB_PASS}
 TOLGEE_AUTHENTICATION_ENABLED=true
 TOLGEE_AUTHENTICATION_INITIAL_USERNAME=admin
-TOLGEE_FILE_STORAGE_FS_DATA_PATH=/opt/tolgee/data/
+TOLGEE_FILE_STORAGE_FS_DATA_PATH=/opt/tolgee_data
 EOF
 msg_ok "Set up Tolgee"
 
@@ -45,7 +45,7 @@ After=network.target
 Type=simple
 User=root
 WorkingDirectory=/opt/tolgee
-EnvironmentFile=/opt/tolgee/.env
+EnvironmentFile=/opt/tolgee_data/.env
 ExecStart=/usr/bin/java -jar /opt/tolgee/tolgee
 Restart=on-failure
 RestartSec=5