diff --git a/.woodpecker/build-cpp-qt.yaml b/.woodpecker/build-cpp-qt.yaml
index 7e26353..258fe36 100644
--- a/.woodpecker/build-cpp-qt.yaml
+++ b/.woodpecker/build-cpp-qt.yaml
@@ -53,7 +53,7 @@ steps:
     when:
       - event: tag
   push_target_repo:
-    image: quay.io/thegeeklab/wp-git-action
+    image: quay.io/thegeeklab/wp-git-action:v2.2.0
     settings:
       path: libre-graph-api-cpp-qt-client
       remote_url: https://github.com/opencloud-eu/libre-graph-api-cpp-qt-client.git
@@ -62,9 +62,7 @@ steps:
         - commit
         - push
       followtags: true
-      message: ${CI_COMMIT_MESSAGE}
-      author_name: ${CI_COMMIT_AUTHOR}
-      author_email: ${CI_COMMIT_AUTHOR_EMAIL}
+      commit-message-from: CI_COMMIT_MESSAGE
       netrc_password:
         from_secret: github_token
       netrc_username:
diff --git a/.woodpecker/build-go.yaml b/.woodpecker/build-go.yaml
index 2ce26b8..ff47e6d 100644
--- a/.woodpecker/build-go.yaml
+++ b/.woodpecker/build-go.yaml
@@ -53,7 +53,7 @@ steps:
     when:
       - event: tag
   push_target_repo:
-    image: quay.io/thegeeklab/wp-git-action
+    image: quay.io/thegeeklab/wp-git-action:v2.2.0
     settings:
       path: libre-graph-api-go
       remote_url: https://github.com/opencloud-eu/libre-graph-api-go.git
@@ -62,9 +62,7 @@ steps:
         - commit
         - push
       followtags: true
-      message: ${CI_COMMIT_MESSAGE}
-      author_name: ${CI_COMMIT_AUTHOR}
-      author_email: ${CI_COMMIT_AUTHOR_EMAIL}
+      commit-message-from: CI_COMMIT_MESSAGE
       netrc_password:
         from_secret: github_token
       netrc_username:
diff --git a/.woodpecker/build-php.yaml b/.woodpecker/build-php.yaml
index d7584f6..f4bb49a 100644
--- a/.woodpecker/build-php.yaml
+++ b/.woodpecker/build-php.yaml
@@ -53,7 +53,7 @@ steps:
     when:
       - event: tag
   push_target_repo:
-    image: quay.io/thegeeklab/wp-git-action
+    image: quay.io/thegeeklab/wp-git-action:v2.2.0
     settings:
       path: libre-graph-api-php
       remote_url: https://github.com/opencloud-eu/libre-graph-api-php.git
@@ -62,9 +62,7 @@ steps:
         - commit
         - push
       followtags: true
-      message: ${CI_COMMIT_MESSAGE}
-      author_name: ${CI_COMMIT_AUTHOR}
-      author_email: ${CI_COMMIT_AUTHOR_EMAIL}
+      commit-message-from: CI_COMMIT_MESSAGE
       netrc_password:
         from_secret: github_token
       netrc_username:
diff --git a/.woodpecker/build-typescript-axios.yaml b/.woodpecker/build-typescript-axios.yaml
index b3a0cd8..888d3ea 100644
--- a/.woodpecker/build-typescript-axios.yaml
+++ b/.woodpecker/build-typescript-axios.yaml
@@ -53,7 +53,7 @@ steps:
     when:
       - event: tag
   push_target_repo:
-    image: quay.io/thegeeklab/wp-git-action
+    image: quay.io/thegeeklab/wp-git-action:v2.2.0
     settings:
       path: libre-graph-api-typescript-axios
       remote_url: https://github.com/opencloud-eu/libre-graph-api-typescript-axios.git
@@ -62,9 +62,7 @@ steps:
         - commit
         - push
       followtags: true
-      message: ${CI_COMMIT_MESSAGE}
-      author_name: ${CI_COMMIT_AUTHOR}
-      author_email: ${CI_COMMIT_AUTHOR_EMAIL}
+      commit-message-from: CI_COMMIT_MESSAGE
       netrc_password:
         from_secret: github_token
       netrc_username: