diff --git a/docs.yaml b/docs.yaml
index 957fdfe..5922564 100644
--- a/docs.yaml
+++ b/docs.yaml
@@ -9,11 +9,11 @@ steps:
       secrets: [ web_pw ]
       commands:
         - export RCLONE_SFTP_PASS="$(rclone obscure $WEB_PW)"
-        - rclone sync ./public/ :sftp:/home/webmaster/${DRONE_REPO_OWNER}/${DRONE_REPO_NAME}
+        - rclone sync ./public/ :sftp:/${CI_REPO_OWNER}/${CI_REPO_NAME}
       environment:
         RCLONE_SFTP_HOST: git.tilera.org
         RCLONE_SFTP_USER: webmaster
-        RCLONE_SFTP_PORT: "2220"
+        RCLONE_SFTP_PORT: "2022"
       when:
           branch: master
           event: push
diff --git a/mpt.yaml b/mpt.yaml
index 4450f2f..b95268a 100644
--- a/mpt.yaml
+++ b/mpt.yaml
@@ -11,7 +11,7 @@ steps:
           api_key:
               from_secret: gitea_token
           note: CHANGELOG.md
-          title: ${DRONE_TAG}
+          title: ${CI_COMMIT_TAG}
           files:
               - build/*
       when:
diff --git a/website.yaml b/website.yaml
index 9fdbaaa..5ee6eb0 100644
--- a/website.yaml
+++ b/website.yaml
@@ -9,11 +9,11 @@ steps:
       secrets: [ web_pw ]
       commands:
         - export RCLONE_SFTP_PASS="$(rclone obscure $WEB_PW)"
-        - rclone sync ./public/ :sftp:/home/webmaster/${DRONE_REPO_OWNER}/${DRONE_REPO_NAME}
+        - rclone sync ./public/ :sftp:/${CI_REPO_OWNER}/${CI_REPO_NAME}
       environment:
         RCLONE_SFTP_HOST: git.tilera.org
         RCLONE_SFTP_USER: webmaster
-        RCLONE_SFTP_PORT: "2220"
+        RCLONE_SFTP_PORT: "2022"
       when:
           branch: master
           event: push