diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 786f6ec3..4a993555 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,6 +14,7 @@ stages:
   - deploy
   - build
   - release
+  - publish
 
 test:
   stage: test
@@ -149,3 +150,18 @@ release:
         - name: "Ditto-${CI_COMMIT_TAG}.apk"
           url: "${CI_PROJECT_URL}/-/jobs/artifacts/${CI_COMMIT_TAG}/raw/artifacts/Ditto-${CI_COMMIT_TAG}.apk?job=build-apk"
           link_type: package
+
+publish-zapstore:
+  stage: publish
+  image: golang:1.24
+  needs:
+    - build-apk
+  rules:
+    - if: $CI_COMMIT_TAG =~ /^v\d+\.\d+\.\d+/
+  variables:
+    SIGN_WITH: $ZAPSTORE_BUNKER_URL
+  script:
+    - go install github.com/zapstore/zsp@latest
+    - APK_PATH="artifacts/Ditto-${CI_COMMIT_TAG}.apk"
+    - 'sed -i "2i release_source: ./${APK_PATH}" zapstore.yaml'
+    - zsp publish -y --skip-metadata --skip-preview zapstore.yaml
diff --git a/zapstore.yaml b/zapstore.yaml
new file mode 100644
index 00000000..d9eb02b2
--- /dev/null
+++ b/zapstore.yaml
@@ -0,0 +1,26 @@
+repository: https://gitlab.com/soapbox-pub/ditto
+
+name: Ditto
+summary: A Nostr client for Android
+
+tags:
+  - nostr
+  - social
+  - messaging
+
+icon: ./public/logo.png
+
+metadata_sources:
+  - gitlab
+
+supported_nips:
+  - "01"
+  - "05"
+  - "07"
+  - "10"
+  - "19"
+  - "25"
+  - "46"
+  - "50"
+  - "57"
+  - "65"