diff --git a/master-galera/master.cfg b/master-galera/master.cfg
index 7a36d644..8cc937cc 100644
--- a/master-galera/master.cfg
+++ b/master-galera/master.cfg
@@ -205,18 +205,21 @@ for platform in all_platforms:
 
 def dpkgDeb():
     return ShellCommand(
-        name="dpkg-scanpackages/sources",
+        name="apt-ftparchive",
         haltOnFailure=True,
         command=[
-            "sh",
+            "bash",
             "-xc",
             util.Interpolate(
                 """set -e
+    [[ -f /etc/apt/sources.list.d/galera-4.list ]] && sudo rm /etc/apt/sources.list.d/galera-4.list
+    sudo apt-get update && sudo apt-get -y install apt-utils
     mkdir -p debs
     find .. -maxdepth 1 -type f -exec cp {} debs/ \;
     cd debs
-    ( dpkg-scanpackages . /dev/null && dpkg-scanpackages --type ddeb . /dev/null  )| gzip -9c > Packages.gz
-    dpkg-scansources . /dev/null | gzip -9c > Sources.gz
+    apt-ftparchive packages . >Packages
+    apt-ftparchive sources . >Sources
+    apt-ftparchive release . >Release
     cd ..
     find debs -type f -exec sha256sum {} \; | sort > sha256sums.txt
 """
@@ -290,12 +293,11 @@ f_deb_build.addStep(
         && cat << EOF > /packages/%(prop:branch)s/%(prop:revision)s/%(prop:buildername)s/galera.sources
 X-Repolib-Name: Galera
 Types: deb
-URIs: %(kw:url)s/galera/%(prop:branch)s/%(prop:revision)s/%(prop:buildername)s
-Suites: $VERSION_CODENAME
-Components: main main/debug
+URIs: %(kw:url)s/galera/%(prop:branch)s/%(prop:revision)s/%(prop:buildername)s/debs
+Suites: ./
 Trusted: yes
 EOF
-        ln -s %(prop:branch)s/%(prop:revision)s/%(prop:buildername)s/galera.sources /packages/%(prop:branch)s-latest-%(prop:buildername)s.sources \
+        ln -sf %(prop:branch)s/%(prop:revision)s/%(prop:buildername)s/galera.sources /packages/%(prop:branch)s-latest-%(prop:buildername)s.sources \
         && sync /packages/%(prop:branch)s/%(prop:revision)s
 """,
             url=os.getenv("ARTIFACTS_URL", default="https://ci.mariadb.org"),