diff --git a/scripts/change_url b/scripts/change_url
index 7d93bc8..2b97884 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -75,7 +75,7 @@ fi
 #=================================================
 ynh_script_progression --message="Stopping a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action="stop"
+ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped Dendrite Matrix homeserver" --log_path="systemd"
 
 #=================================================
 # MODIFY URL IN NGINX CONF
@@ -124,7 +124,7 @@ ynh_add_systemd_config
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 # Start a systemd service
-ynh_systemd_action --service_name=$app --action="start" --line_match="Starting external Monolith listener" --log_path="systemd"
+ynh_systemd_action --service_name=$app --action="start" --line_match="Starting external Monolith listener" --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # RELOAD NGINX
diff --git a/scripts/install b/scripts/install
index 06229dc..552b9af 100644
--- a/scripts/install
+++ b/scripts/install
@@ -126,8 +126,10 @@ ynh_install_go --go_version=$GO_VERSION
 pushd "$final_path/build"
 	# Build the sources
 	ynh_use_go
-	CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/...
-	CGO_ENABLED=0 GOOS=js GOARCH=wasm go build -trimpath -o "$final_path/bin/main.wasm" ./cmd/dendritejs-pinecone
+	CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/dendrite-monolith-server
+	CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/goose
+	CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/create-account
+	CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/generate-keys
 popd
 
 ynh_secure_remove --file="$final_path/build"
@@ -200,7 +202,7 @@ yunohost service add $app --description="Dendrite Matrix homeserver" --log="/var
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 # Start a systemd service
-ynh_systemd_action --service_name=$app --action="start" --line_match="Starting external Monolith listener" --log_path="systemd"
+ynh_systemd_action --service_name=$app --action="start" --line_match="Starting external Monolith listener" --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # RELOAD NGINX
diff --git a/scripts/restore b/scripts/restore
index 68d19ad..fddb741 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -121,7 +121,7 @@ yunohost service add $app --description="Dendrite Matrix homeserver" --log="/var
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action="start" --line_match="Starting external Monolith listener" --log_path="systemd"
+ynh_systemd_action --service_name=$app --action="start" --line_match="Starting external Monolith listener" --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # GENERIC FINALIZATION
diff --git a/scripts/upgrade b/scripts/upgrade
index 6ff70d3..2b11eca 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -118,8 +118,10 @@ then
 	pushd "$final_path/build"
 		# Build the sources
 		ynh_use_go
-		CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/...
-		CGO_ENABLED=0 GOOS=js GOARCH=wasm go build -trimpath -o "$final_path/bin/main.wasm" ./cmd/dendritejs-pinecone
+		CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/dendrite-monolith-server
+		CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/goose
+		CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/create-account
+		CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/generate-keys
 	popd
 
 	ynh_secure_remove --file="$final_path/build"
@@ -171,7 +173,7 @@ yunohost service add $app --description="Dendrite Matrix homeserver" --log="/var
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action="start" --line_match="Starting external Monolith listener" --log_path="systemd"
+ynh_systemd_action --service_name=$app --action="start" --line_match="Starting external Monolith listener" --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # RELOAD NGINX