diff --git a/.github/workflows/CreateRelease.yaml b/.github/workflows/CreateRelease.yaml
deleted file mode 100644
index 636f8b4..0000000
--- a/.github/workflows/CreateRelease.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Publish release
-
-on:
-  push:
-    tags:
-      - "*"
-
-jobs:
-  publish:
-    name: Publish release
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Publish release
-        uses: ghalactic/github-release-from-tag@v4
\ No newline at end of file
diff --git a/.github/workflows/PrepareForPublish.yaml b/.github/workflows/PrepareForPublish.yaml
index a85897f..97ee515 100644
--- a/.github/workflows/PrepareForPublish.yaml
+++ b/.github/workflows/PrepareForPublish.yaml
@@ -83,4 +83,10 @@ jobs:
           tag_name: v${{ env.PUBSPEC_VERSION }}
           release_name: v${{ env.PUBSPEC_VERSION }}
           draft: false
-          prerelease: false
\ No newline at end of file
+          prerelease: false
+
+  publish:
+    needs: CreateTag
+    permissions:
+      id-token: write
+    uses: dart-lang/setup-dart/.github/workflows/publish.yml@v1
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index 030c536..e1c483d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: activitypub
 description: A library for the ActivityPub standard. Created an also used by Fedodo.
-version: 1.0.21
+version: 1.0.22
 repository: https://github.com/Fedodo/Fedodo.Pub.ActivityPub
 
 environment: