diff --git a/.woodpecker/publish.yml b/.woodpecker/publish.yml
index b60f8f1..4950cb5 100644
--- a/.woodpecker/publish.yml
+++ b/.woodpecker/publish.yml
@@ -23,55 +23,52 @@ steps:
       NODE_ENV: production
     commands:
       - yarn build
-      - mv dist ${CI_REPO_NAME}
-  publish-artifacts:
+  package:
     group: prepare-release
     image: alpine:latest
     commands:
       - apk update
       - apk add zip curl
+      - mv dist ${CI_REPO_NAME}
       - zip -r ${CI_REPO_NAME}.zip ${CI_REPO_NAME}/*
-      - export CI_FORGE_API_URL=${CI_FORGE_URL}/api/v4
-      - 'curl --fail --header "Authorization: Bearer $${FORGE_TOKEN}" --upload-file ${CI_REPO_NAME}.zip "$${CI_FORGE_API_URL}/projects/${CI_REPO_REMOTE_ID}/packages/generic/${CI_REPO_NAME}/${CI_COMMIT_TAG}/${CI_REPO_NAME}.zip"'
-      - 'curl --fail --header "Authorization: Bearer $${FORGE_TOKEN}" --upload-file ${CI_REPO_NAME}/$${PACKAGE_TYPE}.json "$${CI_FORGE_API_URL}/projects/${CI_REPO_REMOTE_ID}/packages/generic/${CI_REPO_NAME}/${CI_COMMIT_TAG}/$${PACKAGE_TYPE}.json"'
-    secrets:
-      - forge_token
-      - package_type
+  # publish-artifacts:
+  #   group: prepare-release
+  #   image: alpine:latest
+  #   commands:
+  #     - apk update
+  #     - apk add zip curl
+  #     - zip -r ${CI_REPO_NAME}.zip ${CI_REPO_NAME}/*
+  #     - export CI_FORGE_API_URL=${CI_FORGE_URL}/api
+  #     - 'curl --fail --header "Authorization: token $${FORGE_TOKEN}" --upload-file ${CI_REPO_NAME}.zip "$${CI_FORGE_API_URL}/packages/${CI_REPO_OWNER}/generic/${CI_REPO_NAME}/${CI_COMMIT_TAG}/${CI_REPO_NAME}.zip"'
+  #     - 'curl --fail --header "Authorization: token $${FORGE_TOKEN}" --upload-file ${CI_REPO_NAME}/module.json "$${CI_FORGE_API_URL}/packages/${CI_REPO_OWNER}/generic/${CI_REPO_NAME}/${CI_COMMIT_TAG}/module.json"'
+  #   secrets:
+  #     - forge_token
+  #     - package_type
   changelog:
     group: prepare-release
     image: *node_image
     commands:
       - yarn changelog
   release:
-    image: registry.gitlab.com/gitlab-org/release-cli:latest
-    commands:
-      - export CI_FORGE_API_URL=${CI_FORGE_URL}/api/v4
-      - |
-        release-cli \
-        --server-url ${CI_FORGE_URL} \
-        --private-token $${FORGE_TOKEN} \
-        --project-id ${CI_REPO_REMOTE_ID} \
-        create \
-        --name ${CI_COMMIT_TAG} \
-        --description CHANGELOG.md \
-        --tag-name ${CI_COMMIT_TAG} \
-        --assets-link "[\
-        {\"name\": \"${CI_REPO_NAME}.zip\", \"url\": \"$${CI_FORGE_API_URL}/projects/${CI_REPO_REMOTE_ID}/packages/generic/${CI_REPO_NAME}/${CI_COMMIT_TAG}/${CI_REPO_NAME}.zip\", \"filepath\": \"/${CI_REPO_NAME}.zip\", \"link_type\": \"package\"},\
-        {\"name\": \"$${PACKAGE_TYPE}.json\", \"url\": \"$${CI_FORGE_API_URL}/projects/${CI_REPO_REMOTE_ID}/packages/generic/${CI_REPO_NAME}/${CI_COMMIT_TAG}/$${PACKAGE_TYPE}.json\", \"filepath\": \"/$${PACKAGE_TYPE}.json\", \"link_type\": \"other\"}\
-        ]"
-    secrets:
-      - forge_token
-      - package_type
-  publish-to-foundry-admin:
-    image: johannesloher/foundry-publish
-    environment:
-      FVTT_DELETE_OBSOLETE_VERSIONS: 'true'
-    commands:
-      - export FVTT_MANIFEST_PATH=${CI_REPO_NAME}/$${PACKAGE_TYPE}.json
-      - export FVTT_MANIFEST_URL=${CI_REPO_URL}/-/releases/${CI_COMMIT_TAG}/downlaods/$${PACKAGE_TYPE}.json
-      - foundry-publish
-    secrets:
-      - fvtt_package_id
-      - fvtt_username
-      - fvtt_password
-      - package_type
+    image: woodpeckerci/plugin-gitea-release
+    settings:
+      base_url: ${CI_FORGE_URL}
+      title: ${CI_COMMIT_TAG}
+      note: CHANGELOG.md
+      files:
+        - ${CI_REPO_NAME}.zip
+        - ${CI_REPO_NAME}/module.json
+      api_key:
+        from_secret: forge_token
+  # publish-to-foundry-admin:
+  #   image: johannesloher/foundry-publish
+  #   environment:
+  #     FVTT_DELETE_OBSOLETE_VERSIONS: 'true'
+  #   commands:
+  #     - export FVTT_MANIFEST_PATH=${CI_REPO_NAME}/module.json
+  #     - export FVTT_MANIFEST_URL=${CI_REPO_URL}/-/releases/${CI_COMMIT_TAG}/downlaods/module.json
+  #     - foundry-publish
+  #   secrets:
+  #     - fvtt_package_id
+  #     - fvtt_username
+  #     - fvtt_password
diff --git a/.woodpecker/release.yml b/.woodpecker/release.yml
index 830b494..c4dbcd5 100644
--- a/.woodpecker/release.yml
+++ b/.woodpecker/release.yml
@@ -7,7 +7,7 @@ variables:
 
 when:
   event: manual
-  branch: ${CI_REPO_DEFAULT_BRANCH}
+  branch: git2-test # ${CI_REPO_DEFAULT_BRANCH}
 
 depends_on:
   - checks