diff --git a/gb-infra/src/scripts/alm.sh b/gb-infra/src/scripts/alm.sh
index 1f62f1e..b82b23a 100644
--- a/gb-infra/src/scripts/alm.sh
+++ b/gb-infra/src/scripts/alm.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-ALM_VERSION="v10.0.2"
 HOST_BASE="/opt/gbo/tenants/$PARAM_TENANT/alm"
 HOST_DATA="$HOST_BASE/data"
 HOST_CONF="$HOST_BASE/conf"
 HOST_LOGS="$HOST_BASE/logs"
+ALM_PATH=/opt/gbo/bin
 
 mkdir -p "$HOST_DATA" "$HOST_CONF" "$HOST_LOGS"
 chmod -R 750 "$HOST_BASE"
@@ -14,45 +14,48 @@ sleep 15
 
 lxc exec "$PARAM_TENANT"-alm -- bash -c "
 apt-get update && apt-get install -y git git-lfs wget
-wget https://codeberg.org/forgejo/forgejo/releases/download/$ALM_VERSION/forgejo-$ALM_VERSION-linux-amd64 -O /usr/local/bin/forgejo
-chmod +x /usr/local/bin/forgejo
-useradd --system --no-create-home --shell /bin/false forgejo
+mkdir -p /opt/gbo/bin
+wget https://codeberg.org/forgejo/forgejo/releases/download/v10.0.2/forgejo-10.0.2-linux-amd64 -O $ALM_PATH/forgejo
+chmod +x $ALM_PATH/forgejo
+useradd --system --no-create-home --shell /bin/false alm
 "
 
-FORGEJO_UID=$(lxc exec "$PARAM_TENANT"-alm -- id -u forgejo)
-FORGEJO_GID=$(lxc exec "$PARAM_TENANT"-alm -- id -g forgejo)
+FORGEJO_UID=$(lxc exec "$PARAM_TENANT"-alm -- id -u alm)
+FORGEJO_GID=$(lxc exec "$PARAM_TENANT"-alm -- id -g alm)
 HOST_FORGEJO_UID=$((100000 + FORGEJO_UID))
 HOST_FORGEJO_GID=$((100000 + FORGEJO_GID))
 chown -R "$HOST_FORGEJO_UID:$HOST_FORGEJO_GID" "$HOST_BASE"
 
-lxc config device add "$PARAM_TENANT"-alm almdata disk source="$HOST_DATA" path=/var/lib/forgejo
-lxc config device add "$PARAM_TENANT"-alm almconf disk source="$HOST_CONF" path=/etc/forgejo
-lxc config device add "$PARAM_TENANT"-alm almlogs disk source="$HOST_LOGS" path=/var/log/forgejo
+lxc config device add "$PARAM_TENANT"-alm almdata disk source="$HOST_DATA" path=/opt/gbo/data
+lxc config device add "$PARAM_TENANT"-alm almconf disk source="$HOST_CONF" path=/opt/gbo/conf
+lxc config device add "$PARAM_TENANT"-alm almlogs disk source="$HOST_LOGS" path=/opt/gbo/logs
 
 lxc exec "$PARAM_TENANT"-alm -- bash -c "
-mkdir -p /var/lib/forgejo /etc/forgejo /var/log/forgejo
-chown -R forgejo:forgejo /var/lib/forgejo /etc/forgejo /var/log/forgejo
+mkdir -p /opt/gbo/data /opt/gbo/conf /opt/gbo/logs
+chown -R alm:alm /opt/gbo/data /opt/gbo/conf /opt/gbo/logs
 
-cat > /etc/systemd/system/forgejo.service <<EOF
+cat > /etc/systemd/system/alm.service <<EOF
 [Unit]
-Description=Forgejo
+Description=alm
 After=network.target
 
 [Service]
-User=forgejo
-Group=forgejo
-WorkingDirectory=/var/lib/forgejo
-ExecStart=/usr/local/bin/forgejo web --config /etc/forgejo/app.ini
+User=alm
+Group=alm
+WorkingDirectory=/opt/gbo/data
+ExecStart=/opt/gbo/bin/forgejo web --config /opt/gbo/conf/app.ini
 Restart=always
-Environment=USER=forgejo HOME=/var/lib/forgejo
+Environment=USER=alm HOME=/opt/gbo/data
+StandardOutput=append:/opt/gbo/logs/stdout.log
+StandardError=append:/opt/gbo/logs/stderr.log
 
 [Install]
 WantedBy=multi-user.target
 EOF
 
 systemctl daemon-reload
-systemctl enable forgejo
-systemctl start forgejo
+systemctl enable alm
+systemctl start alm
 "
 
 lxc config device remove "$PARAM_TENANT"-alm alm-proxy 2>/dev/null || true
diff --git a/gb-infra/src/scripts/webmail.sh b/gb-infra/src/scripts/webmail.sh
index 3659de8..6184331 100644
--- a/gb-infra/src/scripts/webmail.sh
+++ b/gb-infra/src/scripts/webmail.sh
@@ -76,6 +76,8 @@ Group=www-data
 WorkingDirectory=$RC_PATH
 ExecStart=/usr/bin/php -S 0.0.0.0:$PARAM_WEBMAIL_PORT -t $RC_PATH/public_html
 Restart=always
+StandardOutput=append:/var/log/roundcube/stdout.log
+StandardError=append:/var/log/roundcube/stderr.log
 
 [Install]
 WantedBy=multi-user.target