diff --git a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2
index 667bb56f37..7a5d012326 100644
--- a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2
+++ b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2
@@ -155,10 +155,10 @@ default_disposable_release: "26"
 
 ## Additional repos for minion to install packages from
 minion_repos:
+  - https://fedorapeople.org/groups/qa/taskotron-repos/taskotron-production-override/taskotron-production-override.repo
   - https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/fedora-infra-tags.repo
 {% if deployment_type == 'stg' %}
   - https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/fedora-infra-tags-stg.repo
-  - https://fedorapeople.org/groups/qa/taskotron-repos/taskotron-production-override/taskotron-production-override.repo
 {% endif %}
 {% if deployment_type == 'dev' %}
   - https://copr.fedorainfracloud.org/coprs/kparal/taskotron-dev/repo/fedora-26/kparal-taskotron-dev-fedora-26.repo
diff --git a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
index aa8c30f977..3796aa0ec8 100644
--- a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
+++ b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
@@ -39,6 +39,12 @@
   do:
     - {tasks: [modularity-testing-framework]}
 
+- when:
+    message_type: GitHubPullRequestOpened
+    repo_name: {$regex: '/^container-images\/.+/'}
+  do:
+    - {tasks: [mtf-containers]}
+
 {# disabled due to missing nested virt: https://pagure.io/taskotron/issue/239
 - when:
     message_type: AtomicCompose
@@ -51,12 +57,3 @@
     - {tasks: [fedora-cloud-tests]}
 #}
 
-{# disabled until pull_request type is supported in stable libtaskotron/trigger
- # and until mtf-containers bugs are resolved
-- when:
-    message_type: GitHubPullRequestOpened
-    repo_name: {$regex: '/^container-images\/.+/'}
-  do:
-    - {tasks: [mtf-containers]}
-#}
-
diff --git a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.stg b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.stg
deleted file mode 100644
index 236e0765c4..0000000000
--- a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.stg
+++ /dev/null
@@ -1,59 +0,0 @@
----
-- when: {message_type: KojiBuildPackageCompleted}
-  do:
-    - {tasks: [rpmlint, rpmgrill, python-versions]}
-    - {discover: {repo: '{{ trigger_distgit_repo_url }}/rpms/${name}{{'.git' if deployment_type in ['stg'] else ''}}', branch: "${distgit_branch}", fallback_branch: 'master', recursive: true}}
-
-- when: {message_type: KojiBuildPackageCompleted, name: docker}
-  do:
-    - {tasks: [dockerautotest]}
-
-- when:
-    message_type: KojiBuildPackageCompleted
-    name:
-      $nin: [{{ trigger_abicheck_blacklist | join(',') }}]
-  do:
-    - {tasks: [abicheck]}
-
-- when:
-    message_type: KojiTagChanged
-    tag: {$regex: '/^f[0-9]{2}-updates(-testing)?-pending$$/'}
-  do:
-    - {tasks: [rpmdeplint]}
-
-{% if deployment_type not in ['stg'] %}
-{# stg bodhi doesn't have the info we need, stg koji doesn't have the builds from prod bodhi #}
-- when:
-    message_type: KojiTagChanged
-    tag: {$regex: '/^f[0-9]{2}-updates-pending$$/'}
-  do:
-    - {tasks: [upgradepath]}
-{% endif %}
-
-- when: {message_type: DistGitCommit, namespace: modules}
-  do:
-    - {tasks: [check_modulemd]}
-
-- when:
-    message_type: ModuleBuildComplete
-  do:
-    - {tasks: [modularity-testing-framework]}
-
-{# disabled due to missing nested virt: https://pagure.io/taskotron/issue/239
-- when:
-    message_type: AtomicCompose
-  do:
-    - {tasks: [upstream-atomic, fedora-cloud-tests]}
-
-- when:
-    message_type: CloudCompose
-  do:
-    - {tasks: [fedora-cloud-tests]}
-#}
-
-- when:
-    message_type: GitHubPullRequestOpened
-    repo_name: {$regex: '/^container-images\/.+/'}
-  do:
-    - {tasks: [mtf-containers]}
-