diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml
index 9cf7f95a4b..3d0b93340c 100644
--- a/roles/bodhi2/backend/tasks/main.yml
+++ b/roles/bodhi2/backend/tasks/main.yml
@@ -178,6 +178,15 @@
   when: inventory_hostname.startswith('bodhi-backend01') and env == "production"
   tags:
   - bodhi
+
+# See https://pagure.io/releng/issue/6663 and https://pagure.io/fm-orchestrator/issue/333
+- name: sync packages from pkgdb2 to koji fedora (modules)
+  cron: name="owner-sync-modules" minute="9,19,29,39,49,59" user="root"
+        job="/usr/local/bin/owner-sync-pkgdb module-package-list"
+        cron_file=update-koji-owner-modules
+  when: inventory_hostname.startswith('bodhi-backend01') and env == "production"
+  tags:
+  - bodhi
 #
 # cron job that syncs updates to master mirror
 #
diff --git a/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2 b/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2
index 00f172f0a6..f8b99a60a8 100755
--- a/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2
+++ b/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2
@@ -81,6 +81,11 @@ if __name__ == '__main__':
     if 'docker' in tag:
         namespace='docker'
         version = tag.split('-')[0].split('f')[1]
+    elif tag == 'module-package-list':
+        # See https://pagure.io/releng/issue/6663
+        # and https://pagure.io/fm-orchestrator/issue/333
+        namespace = 'rpms'
+        version = rawhide
     else:
         namespace='rpms'
         if tag.startswith('epel'):