diff --git a/inventory/group_vars/docker-registry b/inventory/group_vars/docker-registry
index 97faec6be1..b1abe1225f 100644
--- a/inventory/group_vars/docker-registry
+++ b/inventory/group_vars/docker-registry
@@ -3,3 +3,5 @@ ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
 ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
 
 fas_client_groups: sysadmin-releng
+
+tcp_ports: [443]
diff --git a/inventory/group_vars/docker-registry-stg b/inventory/group_vars/docker-registry-stg
index 18f0c26015..8a7cfeb66b 100644
--- a/inventory/group_vars/docker-registry-stg
+++ b/inventory/group_vars/docker-registry-stg
@@ -5,3 +5,5 @@ ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
 fas_client_groups: sysadmin-releng
 
 sudoers: "{{ private }}/files/sudo/00releng-sudoers"
+
+tcp_ports: [443]
diff --git a/inventory/inventory b/inventory/inventory
index ecdfbec06e..494a579b08 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -599,6 +599,10 @@ bugzilla2fedmsg01.stg.phx2.fedoraproject.org
 buildvm-01.stg.phx2.fedoraproject.org
 busgateway01.stg.phx2.fedoraproject.org
 composer.stg.phx2.fedoraproject.org
+copr-be-dev.cloud.fedoraproject.org
+copr-dist-git-dev.fedorainfracloud.org
+copr-fe-dev.cloud.fedoraproject.org
+copr-keygen-dev.cloud.fedoraproject.org
 darkserver-web01.stg.phx2.fedoraproject.org
 darkserver-web02.stg.phx2.fedoraproject.org
 darkserver-backend01.stg.phx2.fedoraproject.org
diff --git a/roles/apps-fp-o/files/apps.yaml b/roles/apps-fp-o/files/apps.yaml
index 5e82ba162b..0ba9659bcc 100644
--- a/roles/apps-fp-o/files/apps.yaml
+++ b/roles/apps-fp-o/files/apps.yaml
@@ -564,10 +564,8 @@ children:
             source_url: https://github.com/fedora-infra/github2fedmsg
             bugs_url:   https://github.com/fedora-infra/github2fedmsg/issues
             docs_url:   https://github.com/fedora-infra/github2fedmsg/blob/develop/README.rst#github2fedmsg
-            # TODO - write sop for github2fedmsg
-            # https://fedorahosted.org/fedora-infrastructure/ticket/5158
-            #sops:
-            #    - https://infrastructure.fedoraproject.org/infra/docs/github2fedmsg.rst
+            sops:
+            - https://infrastructure.fedoraproject.org/infra/docs/github2fedmsg.rst
             status_mappings: ['fedmsg']
             description: >
                 github2fedmsg is a web service that bridges upstream
@@ -744,10 +742,8 @@ children:
             bugs_url:   https://github.com/product-definition-center/product-definition-center/issues
             # Also, https://fedoraproject.org/wiki/Changes/PDC
             docs_url:   https://github.com/product-definition-center/product-definition-center/issues/303
-            # TODO - write SOP for PDC
-            # https://fedorahosted.org/fedora-infrastructure/ticket/5163
-            #sops:
-            #    - https://infrastructure.fedoraproject.org/infra/docs/pdc.rst
+            sops:
+            - https://infrastructure.fedoraproject.org/infra/docs/pdc.rst
             description: >
                 The Product Definition Center (PDC) is a new app we're working
                 on which will track 1) all of the artifacts that release
diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml
index 720473630b..9148dfb8ef 100644
--- a/roles/openqa/server/tasks/main.yml
+++ b/roles/openqa/server/tasks/main.yml
@@ -224,11 +224,16 @@
 # a correct 'changed' for this step is too difficult. Instead we have
 # the prior and following steps; when the templates actually changed,
 # the *following* step will register as changed.
-- name: Load tests
+- name: Load patched tests
   shell: "/tmp/templates --clean"
-  when: "gittests|changed"
+  when: "gittests|changed and deployment_type is defined"
   changed_when: "1 != 1"
 
+- name: Load tests
+  shell: "/var/lib/openqa/share/tests/fedora/templates --clean"
+  when: "gittests|changed and deployment_type is not defined"
+  changed_when: "1 != 1
+
 - name: Check if the tests changed in previous step
   shell: "/usr/share/openqa/script/dump_templates --json > /tmp/tmpl-new.json && json_diff /tmp/tmpl-old.json /tmp/tmpl-new.json"
   when: "gittests|changed"