diff --git a/.github/workflows/stable.build-push.yml b/.github/workflows/stable.build-push.yml
index 3dfa9c3636..ce32e888d0 100644
--- a/.github/workflows/stable.build-push.yml
+++ b/.github/workflows/stable.build-push.yml
@@ -129,9 +129,11 @@ jobs:
           CHANGELOG_MACOS: ${{ steps.releasenotes.outputs.notes_macos }}
         run: |
           path_ios="$(mktemp -d)"
+          cp -av ./appstore_metadata/* "$path_ios"
           echo -n "$CHANGELOG_IOS" > "$path_ios/release_notes.txt"
           echo "path_ios=$path_ios" | tee /dev/stderr >> "$GITHUB_OUTPUT"
           path_macos="$(mktemp -d)"
+          cp -av ./appstore_metadata/* "$path_macos"
           echo -n "$CHANGELOG_MACOS" > "$path_macos/release_notes.txt"
           echo "path_macos=$path_macos" | tee /dev/stderr >> "$GITHUB_OUTPUT"
       - name: Publish ios to appstore connect
@@ -139,7 +141,8 @@ jobs:
         env:
           DELIVER_METADATA_PATH: ${{ steps.metadata.outputs.path_ios }}
         run: |
-          fastlane run upload_to_app_store api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" ipa:"./Monal/build/ipa/Monal.ipa" app_version:"${{ steps.releasenotes.outputs.version }}" reject_if_possible:true submit_for_review:true automatic_release:true skip_metadata:true skip_screenshots:true precheck_include_in_app_purchases:false
+          export
+          fastlane run upload_to_app_store api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" ipa:"./Monal/build/ipa/Monal.ipa" app_version:"${{ steps.releasenotes.outputs.version }}" reject_if_possible:true submit_for_review:true automatic_release:true skip_metadata:false skip_screenshots:true precheck_include_in_app_purchases:false version_check_wait_retry_limit:10
       - name: Notarize catalyst
         run: xcrun notarytool submit ./Monal/build/app/Monal.zip --wait --team-id S8D843U34Y --key "/Users/ci/appstoreconnect/apiKey.p8" --key-id "$(cat /Users/ci/appstoreconnect/apiKeyId.txt)" --issuer "$(cat /Users/ci/appstoreconnect/apiIssuerId.txt)"
       - name: staple
@@ -166,7 +169,8 @@ jobs:
         env:
           DELIVER_METADATA_PATH: ${{ steps.metadata.outputs.path_macos }}
         run: |
-          fastlane run upload_to_app_store api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" pkg:"./Monal/build/app/Monal.pkg" app_version:"${{ steps.releasenotes.outputs.version }}" reject_if_possible:true submit_for_review:true automatic_release:true skip_metadata:true skip_screenshots:true precheck_include_in_app_purchases:false
+          export
+          fastlane run upload_to_app_store api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" pkg:"./Monal/build/app/Monal.pkg" app_version:"${{ steps.releasenotes.outputs.version }}" reject_if_possible:true submit_for_review:true automatic_release:true skip_metadata:false skip_screenshots:true precheck_include_in_app_purchases:false version_check_wait_retry_limit:10
       # - name: Update xmpp.org client list with new timestamp
       #   run: ./scripts/push_xmpp.org.sh
       - name: Remove fastlane metadata directory
diff --git a/AppStoreDescription.md b/AppStoreDescription.md
deleted file mode 100644
index 2832403f4e..0000000000
--- a/AppStoreDescription.md
+++ /dev/null
@@ -1,35 +0,0 @@
-There has never been a better time to get into XMPP, a free public chat network that no one controls or owns. 
-Monal is a fast and user friendly way to use the decentralized XMPP protocol (known as Jabber). Just download the app, login or register and you are ready 
-to chat in minutes. Monal attempts to create a decent chat experience with XMPP in the Apple ecosystem.
-
-Notable features:
-
-- Open Source and free software (BSD 2-Clause License)
-- No Ads! Strong focus on privacy. Monal does not track you and does not have data metric software 
-included and does not read any personal information. 
-- With the XMPP protocol a direct connection to your server ensures you can keep control of your data.
-- Encrypted chat with OMEMO
-- Monal will work with corporate XMPP servers that require a VPN
-- Group chat integration (MUC)
-
-The software is available on iOS and MacOS.
-
-Monal implements XEP modules and extensions to ensure an enjoyable mobile communication experience:
-
-- XEP-0030: Service Discovery
-- XEP-0059: Result Set Management
-- XEP-0084: User Avatar
-- XEP-0085: Chat State Notifications
-- XEP-0092: Software Version
-- XEP-0115: Entity Capabilities
-- XEP-0162: Best Practices for Roster and Subscription Management
-- XEP-0163: Personal Eventing Protocol
-- XEP-0172: User Nickname
-- XEP-0184: Message Receipts
-- XEP-0198: Stream Management
-- XEP-0199: XMPP Ping to maintain connections
-- XEP-0280: Message Carbons
-- XEP-0313: Message Archive Management
-- XEP-0352: Client State Indication
-- XEP-0357: Push Notifications
-- XEP-0363: HTTP File Upload
diff --git a/appstore_metadata/description.txt b/appstore_metadata/description.txt
new file mode 100644
index 0000000000..36b1139478
--- /dev/null
+++ b/appstore_metadata/description.txt
@@ -0,0 +1,20 @@
+There has never been a better time to get into XMPP, a free public chat network no one controls or owns. Monal is a fast and user friendly way to use XMPP. Just download the app,  login or register and you are ready to chat in minutes. It looks and works the way other apps do, so there is no need to “learn XMPP” or even care what it is.
+
+Notable features:
+- Open Source
+- No Ads! Strong focus on privacy. Does not phone home and does not have "metrics" software 
+- Does not read any personal information. 
+- With a direct connection to your server, your password  and all other info is never sent to a third party.
+- OMEMO encrypted chat
+- Will work with corporate XMPP servers that require VPN
+- MUC multi user chat
+- Audio/Video calls
+
+Implements XMPP certain extensions intended to improve mobile communication.
+- XEP-0357: Push Notifications
+- XEP-0280: Message Carbons keep messages in synch between clients.
+- XEP-0198: Stream Management to quickly reconnect.
+- XEP-0199: XMPP Ping to maintain connections.
+- XEP-0313: Message Archive Management to download chat history.
+- XEP-0352: Client State Indication for dramatic reduction on power use.
+- XEP-0363: HTTP File Upload to send images in conversations.
diff --git a/appstore_metadata/keywords.txt b/appstore_metadata/keywords.txt
new file mode 100644
index 0000000000..cc2016d901
--- /dev/null
+++ b/appstore_metadata/keywords.txt
@@ -0,0 +1 @@
+xmpp, jabber, chat, instant messaging, messaging, ejabberd, prosody, OMEMO
\ No newline at end of file