diff --git a/files/common/rhel8.repo b/files/common/rhel8.repo
index 96865005aa..6b5397ab47 100644
--- a/files/common/rhel8.repo
+++ b/files/common/rhel8.repo
@@ -30,5 +30,5 @@ gpgcheck=1
 name = rhel8 CodeReadyBuilder $basearch
 baseurl=https://infrastructure.fedoraproject.org/repo/rhel/rhel8/$basearch/codeready-builder-for-rhel-8-$basearch-rpms/
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-enabled=0
+enabled=1
 gpgcheck=1
diff --git a/roles/distgit/pagure/tasks/main.yml b/roles/distgit/pagure/tasks/main.yml
index f80dba816b..1c9ad0ba66 100644
--- a/roles/distgit/pagure/tasks/main.yml
+++ b/roles/distgit/pagure/tasks/main.yml
@@ -86,6 +86,7 @@
     etype: group
     permissions: r
     state: present
+  when: env != "staging"
 
 # Set-up Pagure