diff --git a/.drone.yml b/.drone.yml
index f648ce2c0..304a74532 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -19,21 +19,16 @@ steps:
   - name: clone friendica addon
     image: alpine/git
     commands:
-      - git clone $DRONE_REMOTE_URL addon
-      - git checkout $DRONE_COMMIT_REF
-  - name: Run default Xgettext
+      - git clone $DRONE_REPO_LINK addon
+      - cd addon/
+      - git checkout $DRONE_COMMIT_BRANCH
+      - git fetch origin $DRONE_COMMIT_REF
+      - git merge $DRONE_COMMIT_SHA
+  - name: Run Xgettext for addons
     image: friendicaci/transifex
     commands:
-      - export CHANGED_FILES=($(git diff --name-status ${DRONE_COMMIT_BEFORE}..${DRONE_COMMIT_AFTER} | grep ^A | cut -f2))
-      - export FIND_RESULT=$(printf "%s\n" "$CHANGED_FILES[@]" | sed '/^\./d' | cut -d "/" -f1 | uniq)
-      - for addon in $FIND_RESULT; do ./bin/run_xgettext.sh --addon $addon; done
+      - /xgettext-addon.sh
   - name: Check update necessary
-    image: alpine/git
+    image: friendicaci/transifex
     commands:
-      - cd addon/
-      - if [[ $(git diff -U0 "**/messages.po" | awk '!/index|diff|\-\-\-|\+\+\+|@@|\-"POT-Creation-Date|\+"POT-Creation-Date|\+#|\-#/{print }' | wc -l) > 0 ]]; then
-          echo "::error file=messages.po::messages.po is out of date"
-          exit 1
-        else
-          echo "Nothing to update"
-        fi
+      - /check-addons.sh
diff --git a/.github/workflows/transifex.yml b/.github/workflows/transifex.yml
deleted file mode 100644
index c979dd79a..000000000
--- a/.github/workflows/transifex.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-name: Transifex
-on: [pull_request]
-
-jobs:
-  messages:
-    name: Check messages.po changes
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install gettext
-        run: sudo apt-get install gettext
-
-      - name: Checkout Friendica Base
-        uses: actions/checkout@v2
-        with:
-          repository: 'friendica/friendica'
-          ref: ${{ github.base_ref }}
-
-      - name: Checkout current Friendica Addons
-        uses: actions/checkout@v2
-        with:
-          path: 'addon'
-
-      - name: Get changed files
-        id: changes
-        uses: jitterbit/get-changed-files@v1
-
-      - name: Run Xgettext for each changed addon
-        run: |
-          addon_files=(${{ steps.changes.outputs.all }})
-          find_result=$(printf "%s\n" "${addon_files[@]}" | sed '/^\./d' | cut -d "/" -f1 | uniq)
-          for addon in $find_result
-          do
-            ./bin/run_xgettext.sh --addon $addon
-          done
-
-      - name: Check if messages.po needs an update
-        run: |
-          echo "::group::Check messages.po"
-          # Skip all lines of the git diff starting with "@@" or comments or starting "POT-Creation-Date"
-          cd addon/
-          if [[ $(git diff -U0 "**/messages.po" | awk '!/index|diff|\-\-\-|\+\+\+|@@|\-"POT-Creation-Date|\+"POT-Creation-Date|\+#|\-#/{print }' | wc -l) > 0 ]]; then
-            echo "::error file=messages.po::messages.po is out of date"
-            exit 1
-          else
-            echo "Nothing to update"
-          fi
-          echo "::endgroup::"
-        shell: bash