diff --git a/.woodpecker/.deploy.yaml b/.woodpecker/.deploy.yaml
index bc7cce6..d4327c3 100644
--- a/.woodpecker/.deploy.yaml
+++ b/.woodpecker/.deploy.yaml
@@ -1,7 +1,4 @@
 skip_clone: true
-variables:
-  - &test
-    PR_BODY_MESSAGE: lol
 steps:
 - name: bump tag in deployment-repo (prod)
   image: git.ar21.de/aaron/kustomize-ci
@@ -51,25 +48,10 @@ steps:
     - branch:
         exclude: master
       event: push
-- name: generate random pull request message
+- name: create pull request (prod)
   image: git.ar21.de/tom/push-message-randomizer:latest
   pull: true
-  environment:
-    <<: *test
-  commands:
-    - /entrypoint.sh
-    - echo "${PR_BODY_MESSAGE}"
-    - PR_BODY_MESSAGE="$(cat message.txt)"
-    - echo "${PR_BODY_MESSAGE}"
-  when:
-    - event: push
-- name: create pull request (prod)
-  image: johnwalkerx/gitea-pull-request-create-plugin:latest
-  pull: true
-  #commands:
-  #  - PLUGIN_PR_BODY_MESSAGE="$(cat message.txt)"
   settings:
-    pr_body_message: ""
     gitea_address: https://git.ar21.de
     gitea_token:
       from_secret: FORGEJO_API
@@ -81,7 +63,7 @@ steps:
     pr_body: |
       ### ℹ Dashboard image update
 
-      $${PLUGIN_PR_BODY_MESSAGE}
+      {- random-pr-message -}
 
       ### Configuration
 
@@ -97,10 +79,9 @@ steps:
     - branch: master
       event: push
 - name: create pull request (staging)
-  image: johnwalkerx/gitea-pull-request-create-plugin:latest
+  image: git.ar21.de/tom/push-message-randomizer:latest
   pull: true
   settings:
-    <<: *test
     gitea_address: https://git.ar21.de
     gitea_token:
       from_secret: FORGEJO_API
@@ -112,8 +93,7 @@ steps:
     pr_body: |
       ### ℹ Dashboard image update
 
-      ${PLUGIN_PR_BODY_MESSAGE}
-      ${PR_BODY_MESSAGE}
+      {- random-pr-message -}
 
       ### Configuration