diff --git a/inventory/group_vars/taskotron-prod b/inventory/group_vars/taskotron-prod
index 9e080ea81f..707b14d767 100644
--- a/inventory/group_vars/taskotron-prod
+++ b/inventory/group_vars/taskotron-prod
@@ -31,7 +31,7 @@ grokmirror_repos:
   - { name: fedoraqa/rpmlint, url: 'https://pagure.io/taskotron/task-rpmlint.git'}
   - { name: fedoraqa/upgradepath, url: 'https://pagure.io/taskotron/task-upgradepath.git'}
   - { name: fedoraqa/upstream-atomic, url: 'https://pagure.io/taskotron/task-upstream-atomic.git'}
-grokmirror_default_branch: master
+grokmirror_default_branch: develop
 
 
 ############################################################
diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
index ca5f94a988..180bd8a2df 100644
--- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
+++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
@@ -207,15 +207,11 @@ factory.addStep(ShellCommand(command=["runtask",
                                         '-a', Interpolate('%(prop:arch)s'),
                                         '-j', Interpolate('%(prop:buildername)s/%(prop:buildnumber)s'),
                                         '--uuid', Interpolate('%(prop:uuid)s'),
-{% if deployment_type in ['dev', 'stg'] %}
                                         '.'],
-{% else %}
-                                        'runtask.yml'],
-{% endif %}
                              descriptionDone=[Interpolate('%(prop:taskname)s on %(prop:item)s')],
                              name='runtask',
                              timeout=20*60,
-{% if deployment_type in ['dev', 'stg'] %}
+{% if deployment_type in ['dev', 'stg', 'prod'] %}
                              sigtermTime=5*60,
                              lazylogfiles=True,
                              logfiles={
@@ -223,13 +219,6 @@ factory.addStep(ShellCommand(command=["runtask",
                                  'heartbeat.log': {'filename': Interpolate('/var/lib/taskotron/artifacts/%(prop:uuid)s/taskotron/heartbeat.log')},
                              }
 {% endif %}
-{% if deployment_type in ['prod'] %}
-                             logfiles={
-                                 'taskotron-overlord.log': {'filename': Interpolate('/var/lib/taskotron/artifacts/%(prop:uuid)s/taskotron-overlord.log')},
-                                 'taskotron-stdio.log': {'filename': Interpolate('/var/lib/taskotron/artifacts/%(prop:uuid)s/taskotron-stdio.log')},
-                                 'taskotron.log': {'filename': Interpolate('/var/lib/taskotron/artifacts/%(prop:uuid)s/taskotron.log')}
-                             }
-{% endif %}
 {% if deployment_type in ['local'] %}
                              logfiles={'taskotron.log': {'filename': '/var/log/taskotron/taskotron.log', }}
 {% endif %}
@@ -244,22 +233,12 @@ factory.addStep(MasterShellCommand(command=["mkdir", '-m', '0755', Interpolate('
                                    descriptionDone=['Create artifacs dir']))
 
 # copy artifacts to master
-{% if deployment_type in ['dev', 'stg'] %}
 factory.addStep(DirectoryUpload(slavesrc=Interpolate('/var/lib/taskotron/artifacts/%(prop:uuid)s/'),
                                 masterdest=Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/')))
-{% else %}
-factory.addStep(DirectoryUpload(slavesrc=Interpolate('/var/lib/taskotron/artifacts/%(prop:uuid)s/'),
-                                masterdest=Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/task_output')))
-{% endif %}
 
 # gzip artifacts
-{% if deployment_type in ['dev', 'stg'] %}
 factory.addStep(MasterShellCommand(command=Interpolate('find {{ public_artifacts_dir }}/%(prop:uuid)s/ -type f -exec gzip {} \;'),
                                    descriptionDone=['gzip artifacs dir content']))
-{% else %}
-factory.addStep(MasterShellCommand(command=Interpolate('find {{ public_artifacts_dir }}/%(prop:uuid)s/task_output/ -type f -exec gzip {} \;'),
-                                   descriptionDone=['gzip artifacs dir content']))
-{% endif %}
 
 {% if deployment_type in ['local'] %}
 # copy taskotron log to master
diff --git a/roles/taskotron/taskotron-master/templates/artifacts.conf.j2.prod b/roles/taskotron/taskotron-master/templates/artifacts.conf.j2.prod
deleted file mode 100644
index 5262dc0d85..0000000000
--- a/roles/taskotron/taskotron-master/templates/artifacts.conf.j2.prod
+++ /dev/null
@@ -1,62 +0,0 @@
-Alias /artifacts {{ public_artifacts_dir }}
-
-
-<Directory "{{ public_artifacts_dir }}">
-    Options +Indexes
-    IndexOptions +NameWidth=*
-    IndexOptions FancyIndexing
-    IndexOrderDefault Ascending Name
-    AllowOverride None
-    Require all granted
-</Directory>
-
-
-<Directory "{{ public_artifacts_dir }}/all">
-    Options -Indexes
-</Directory>
-
-
-<DirectoryMatch "^{{ public_artifacts_dir }}/all/(.+)/">
-    Options +Indexes
-    IndexOptions +NameWidth=*
-    AllowOverride None
-    Require all granted
-</DirectoryMatch>
-
-
-ExtFilterDefine gz-to-plain mode=output \
-intype=application/x-gzip outtype=text/plain \
-cmd="/bin/gunzip -c -"
-
-ExtFilterDefine gz-to-html mode=output \
-intype=application/x-gzip outtype=text/html \
-cmd="/bin/gunzip -c -"
-
-ExtFilterDefine gz-to-css mode=output \
-intype=application/x-gzip outtype=text/css \
-cmd="/bin/gunzip -c -"
-
-<DirectoryMatch "^{{ public_artifacts_dir }}/all/(.+)/task_output/">
-    RewriteEngine on
-
-    RewriteCond   "{{ public_artifacts_dir }}/all/$1/task_output/$2.gz"  -f
-    RewriteCond   "{{ public_artifacts_dir }}/all/$1/task_output/$2"     !-f
-    RewriteRule   "^{{ public_artifacts_dir }}/all/(.+)/task_output/(.*)$"  "{{ public_artifacts_dir }}/all/$1/task_output/$2.gz"
-
-    # mod_deflate doesnt work as expected for some reason
-    # use custom filter instead
-    <FilesMatch "(?!html)">
-        SetOutputFilter gz-to-plain
-    </FilesMatch>
-    <FilesMatch "(?!css)">
-        SetOutputFilter gz-to-css
-    </FilesMatch>
-    <FilesMatch "(\.html\.gz|\.html)$">
-        SetOutputFilter gz-to-html
-    </FilesMatch>
-
-    # keep the mod_deflate for reference though
-    #AddEncoding x-gzip .gz
-    #SetOutputFilter INFLATE
-    #ForceType text/plain
-</DirectoryMatch>
diff --git a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
index 5c77a4f681..8e975a5446 100644
--- a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
+++ b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
@@ -38,22 +38,6 @@
     - tasks:
         - mtf-containers
 
-{% if deployment_type in ['prod'] %}
-{# these tasks are not ansiblized yet #}
-- when:
-    message_type: ModuleBuildComplete
-  do:
-    - tasks:
-        - modularity-testing-framework
-
-- when:
-    message_type: KojiBuildPackageCompleted
-    name: docker
-  do:
-    - tasks:
-        - dockerautotest
-{% endif %}
-
 {# disabled due to missing nested virt: https://pagure.io/taskotron/issue/239
 - when:
     message_type: AtomicCompose