diff --git a/.github/pub.dev.yml b/.github/pub.dev.yml
new file mode 100644
index 0000000..642b487
--- /dev/null
+++ b/.github/pub.dev.yml
@@ -0,0 +1,15 @@
+name: Publish to pub.dev
+
+on:
+  push:
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+*'
+
+jobs:
+  publish:
+    permissions:
+      id-token: write # Required for authentication using OIDC
+    uses: dart-lang/setup-dart/.github/workflows/publish.yml@v1
+    with:
+      environment: 'pub.dev'
+      # working-directory: path/to/package/within/repository
diff --git a/.release-it.json b/.release-it.json
index f917256..307ac3e 100644
--- a/.release-it.json
+++ b/.release-it.json
@@ -6,10 +6,6 @@
             "flutter pub get",
             "npx auto-changelog -v ${version} -c .auto-changelog",
             "flutter pub publish --to-archive abrevva_${version}.tgz"
-        ],
-        "after:version:afterRelease": [
-            "git checkout refs/tags/${version}",
-            "flutter pub publish --force"
         ]
     },
     "npm": {
@@ -20,13 +16,14 @@
     "git": {
         "commitMessage": "chore: release ${version}",
         "tagName": "${version}",
+        "tag": true,
         "commitArgs": [
             "-S"
         ],
         "tagArgs": [
             "-s"
         ],
-        "push": false
+        "push": true
     },
     "github": {
         "release": true,