diff --git a/conf/systemd.service b/conf/systemd.service
index ea676ee..f277cdc 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -6,10 +6,10 @@ After=syslog.target network.target mysql.service slapd.service redis.service
 Type=simple
 User=__APP__
 Group=__APP__
-WorkingDirectory=/home/yunohost.app/__APP__
+WorkingDirectory=__DATADIR__
 ExecStart=__FINALPATH__/gogs web
 Restart=always
-Environment=USER=__APP__ HOME=/home/yunohost.app/__APP__
+Environment=USER=__APP__ HOME=__DATADIR__
 
 [Install]
 WantedBy=multi-user.target
diff --git a/scripts/change_url b/scripts/change_url
index 3c3015d..0f6fe08 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -125,7 +125,7 @@ ynh_add_config --template="../conf/app.ini" --destination="$final_path/custom/co
 chmod 400 "$final_path/custom/conf/app.ini"
 chown $app:$app "$final_path/custom/conf/app.ini"
 
-ynh_add_config --template="../conf/ldap.conf" --destination="$final_path/custom/conf/auth.d/ldap.conf"
+#ynh_add_config --template="../conf/ldap.conf" --destination="$final_path/custom/conf/auth.d/ldap.conf"
 
 #=================================================
 # GENERIC FINALISATION