diff --git a/conf/systemd.service b/conf/systemd.service
index 7f91b11..ff2527e 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -8,8 +8,8 @@ After=network.target
 User=__APP__
 Group=__APP__
 WorkingDirectory=__FINALPATH__/live/
-ReadWriteDirectories=__FINALPATH__/live/
-EnvironmentFile=__FINALPATH__/live/vaultwarden.env
+ReadWriteDirectories=__FINALPATH__/live/ __DATADIR__
+EnvironmentFile=__FINALPATH__/live/.env
 ExecStart=__FINALPATH__/live/vaultwarden
 
 # Set reasonable connection and process limits
diff --git a/scripts/change_url b/scripts/change_url
index 3a5905e..6c3a863 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -114,7 +114,7 @@ fi
 #=================================================
 ynh_script_progression --message="Modifying a config file..."
 
-config="$final_path/live/vaultwarden.env"
+config="$final_path/live/.env"
 
 ynh_backup_if_checksum_is_different --file="$config"
 
diff --git a/scripts/install b/scripts/install
index 98d090e..81f2a09 100644
--- a/scripts/install
+++ b/scripts/install
@@ -156,10 +156,10 @@ chown -R $app:$app "$datadir"
 #=================================================
 ynh_script_progression --message="Adding a configuration file..."
 
-ynh_add_config --template="../conf/vaultwarden.env" --destination="$final_path/live/vaultwarden.env"
+ynh_add_config --template="../conf/vaultwarden.env" --destination="$final_path/live/.env"
 
-chmod 400 "$final_path/live/vaultwarden.env"
-chown $app:$app "$final_path/live/vaultwarden.env"
+chmod 400 "$final_path/live/vaulwarden.env"
+chown $app:$app "$final_path/live/.env"
 
 #=================================================
 # SETUP SYSTEMD
diff --git a/scripts/upgrade b/scripts/upgrade
index 53daeee..217f73f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -72,9 +72,9 @@ then
 	db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 
 	# Move config file
-	mv $final_path/live/bitwarden_rs.env $final_path/live/vaultwarden.env
+	mv $final_path/live/bitwarden_rs.env $final_path/live/.env
 	ynh_delete_file_checksum --file="/var/www/$old_app/live/bitwarden_rs.env"
-	ynh_store_file_checksum --file="$final_path/live/vaultwarden.env" 
+	ynh_store_file_checksum --file="$final_path/live/.env" 
 	ynh_secure_remove --file="$final_path/live/bitwarden_rs"
 
 	# Manage permissions
@@ -214,10 +214,10 @@ fi
 #=================================================
 ynh_script_progression --message="Updating a configuration file..."
 
-ynh_add_config --template="../conf/vaultwarden.env" --destination="$final_path/live/vaultwarden.env"
+ynh_add_config --template="../conf/vaultwarden.env" --destination="$final_path/live/.env"
 
-chmod 400 "$final_path/live/vaultwarden.env"
-chown $app:$app "$final_path/live/vaultwarden.env"
+chmod 400 "$final_path/live/.env"
+chown $app:$app "$final_path/live/.env"
 
 #=================================================
 # SETUP SYSTEMD