diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 9d50f6f8f9100b..a7177d99f8c566 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -73,6 +73,20 @@ jobs:
         with:
           name: release-apk-signed
 
+      - name: Download Geonames database
+        run: |
+          mkdir geodata
+          cd geodata
+          curl -o cities500.zip https://download.geonames.org/export/dump/cities500.zip
+          curl -o admin1CodesASCII.txt https://download.geonames.org/export/dump/admin1CodesASCII.txt
+          curl -o admin2Codes.txt https://download.geonames.org/export/dump/admin2Codes.txt
+          curl -o LICENSE https://creativecommons.org/licenses/by/4.0/legalcode.txt
+          unzip cities500.zip
+          rm -f cities500.zip
+          date --iso-8601=seconds | tr -d "\n" > geodata-date.txt
+          cd ..
+          zip -r geodata.zip geodata/*
+
       - name: Create draft release
         uses: softprops/action-gh-release@v2
         with:
@@ -86,4 +100,5 @@ jobs:
             docker/hwaccel.ml.yml
             docker/hwaccel.transcoding.yml
             docker/prometheus.yml
+            geodata.zip
             *.apk