diff --git a/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2 b/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2
index 5e3a0ab8d1..73f48feccb 100644
--- a/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2
+++ b/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2
@@ -2,7 +2,7 @@
 url = http://127.0.0.1:8080/change_hook
 
 [trigger]
-valid_arches = x86_64
+valid_arches = x86_64,armhfp
 koji_url = http://koji.fedoraproject.org/kojihub
 datagrepper_url = https://apps.fedoraproject.org/datagrepper/raw
 execdb_server = {{ execdb_server }}
diff --git a/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2.dev b/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2.prod
similarity index 95%
rename from roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2.dev
rename to roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2.prod
index 73f48feccb..5e3a0ab8d1 100644
--- a/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2.dev
+++ b/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2.prod
@@ -2,7 +2,7 @@
 url = http://127.0.0.1:8080/change_hook
 
 [trigger]
-valid_arches = x86_64,armhfp
+valid_arches = x86_64
 koji_url = http://koji.fedoraproject.org/kojihub
 datagrepper_url = https://apps.fedoraproject.org/datagrepper/raw
 execdb_server = {{ execdb_server }}
diff --git a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
index b407b9daae..7461a521b2 100644
--- a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
+++ b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
@@ -2,10 +2,13 @@
 - when:
     message_type: KojiBuildPackageCompleted
   do:
+    - tasks:
+        - rpmlint
     - tasks:
         - python-versions
         - rpmgrill
-        - rpmlint
+      arches:
+        - noarch
 
 - when:
     message_type: KojiBuildPackageCompleted
@@ -29,6 +32,8 @@
   do:
     - tasks:
         - check_modulemd
+      arches:
+        - noarch
 
 - when:
     message_type: GitHubPullRequestOpened
@@ -37,3 +42,6 @@
   do:
     - tasks:
         - mtf-containers
+      arches:
+        - noarch
+
diff --git a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.dev b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.prod
similarity index 86%
rename from roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.dev
rename to roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.prod
index 7461a521b2..b407b9daae 100644
--- a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.dev
+++ b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.prod
@@ -2,13 +2,10 @@
 - when:
     message_type: KojiBuildPackageCompleted
   do:
-    - tasks:
-        - rpmlint
     - tasks:
         - python-versions
         - rpmgrill
-      arches:
-        - noarch
+        - rpmlint
 
 - when:
     message_type: KojiBuildPackageCompleted
@@ -32,8 +29,6 @@
   do:
     - tasks:
         - check_modulemd
-      arches:
-        - noarch
 
 - when:
     message_type: GitHubPullRequestOpened
@@ -42,6 +37,3 @@
   do:
     - tasks:
         - mtf-containers
-      arches:
-        - noarch
-