diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml
index 397d842f8b..f3631f8b42 100644
--- a/playbooks/groups/buildvm.yml
+++ b/playbooks/groups/buildvm.yml
@@ -89,6 +89,11 @@
     - role: btrfs
       btrfs_balance_period: weekly
     # push built Flatpaks to candidate registry
+    - role: login-registry
+      candidate_registry: "candidate-registry.fedoraproject.org"
+      candidate_registry_osbs_username: "{{candidate_registry_osbs_username}}"
+      candidate_registry_osbs_password: "{{candidate_registry_osbs_password}}"
+      when: env == "production"
     - role: login-registry
       candidate_registry: "candidate-registry.stg.fedoraproject.org"
       candidate_registry_osbs_username: "{{candidate_registry_osbs_stg_username}}"
diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index 2271c29407..1b4107bfee 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -128,12 +128,11 @@
   package: name=koji-flatpak-builder state=present
   tags:
   - koji_builder
-  when: env == "staging"
 
 - name: configure flatpak-builder plugin
   template: src=flatpak.conf dest=/etc/kojid/plugins/flatpak.conf
   vars:
-    candidate_registry: "candidate-registry.stg.fedoraproject.org"
+    candidate_registry: "candidate-registry{{ env_suffix }}.fedoraproject.org"
   notify:
   - restart kojid
   tags:
diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf
index 6f1a342363..c04ce4cef3 100644
--- a/roles/koji_builder/templates/kojid.conf
+++ b/roles/koji_builder/templates/kojid.conf
@@ -121,9 +121,7 @@ keytab = /etc/kojid/kojid.keytab
 
 {{ plugins.append("scmpolicy") }}
 
-{% if env == 'staging' %}
 {{ plugins.append("flatpak") }}
-{% endif %}
 
 ; Config for the runroot plugin lives in /etc/kojid/runroot.conf, if enabled
 plugins = {{ plugins | join(" ") }}
diff --git a/roles/koji_hub/tasks/main.yml b/roles/koji_hub/tasks/main.yml
index 61be30fa7f..19afa51128 100644
--- a/roles/koji_hub/tasks/main.yml
+++ b/roles/koji_hub/tasks/main.yml
@@ -210,7 +210,6 @@
   package: name=koji-flatpak-hub state=present
   tags:
   - koji_hub
-  when: env == "staging"
 
 #
 # install keytabs
diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2
index 50d912640e..da9af4fe4f 100644
--- a/roles/koji_hub/templates/hub.conf.j2
+++ b/roles/koji_hub/templates/hub.conf.j2
@@ -90,7 +90,7 @@ MissingPolicyOk = False
 {% if env == "staging" %}
 Plugins = osbuild koji-fedoramessaging runroot_hub hub_containerbuild tag2distrepo sidetag_hub save_failed_tree flatpak
 {% else %}
-Plugins = osbuild koji-fedoramessaging runroot_hub hub_containerbuild tag2distrepo sidetag_hub save_failed_tree
+Plugins = osbuild koji-fedoramessaging runroot_hub hub_containerbuild tag2distrepo sidetag_hub save_failed_tree flatpak
 {% endif %}
 [policy]