diff --git a/Schutzfile b/Schutzfile
index eb97ded17..9b647724d 100644
--- a/Schutzfile
+++ b/Schutzfile
@@ -23,34 +23,34 @@
       "file": "/etc/yum.repos.d/rhel8internal.repo",
       "x86_64": [
         {
-          "title": "RHEL-8-NIGHTLY-BaseOS",
+          "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS",
           "name": "baseos",
           "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201"
         },
         {
-          "title": "RHEL-8-NIGHTLY-AppStream",
+          "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream",
           "name": "appstream",
           "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201"
         },
         {
-          "title": "RHEL-8-NIGHTLY-CRB",
+          "title": "RHEL-8-RPMREPO-NIGHTLY-CRB",
           "name": "crb",
           "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-crb-n8.6-20220201"
         }
       ],
       "aarch64": [
         {
-          "title": "RHEL-8-NIGHTLY-BaseOS",
+          "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS",
           "name": "baseos",
           "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.6-20220201"
         },
         {
-          "title": "RHEL-8-NIGHTLY-AppStream",
+          "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream",
           "name": "appstream",
           "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.6-20220201"
         },
         {
-          "title": "RHEL-8-NIGHTLY-CRB",
+          "title": "RHEL-8-RPMREPO-NIGHTLY-CRB",
           "name": "crb",
           "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-crb-n8.6-20220201"
         }
@@ -67,34 +67,34 @@
       "file": "/etc/yum.repos.d/rhel9internal.repo",
       "x86_64": [
         {
-          "title": "RHEL-9-NIGHTLY-BaseOS",
+          "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
           "name": "baseos",
           "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.0-20220201"
         },
         {
-          "title": "RHEL-9-NIGHTLY-AppStream",
+          "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
           "name": "appstream",
           "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.0-20220201"
         },
         {
-          "title": "RHEL-9-NIGHTLY-CRB",
+          "title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
           "name": "crb",
           "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.0-20220201"
         }
       ],
       "aarch64": [
         {
-          "title": "RHEL-9-NIGHTLY-BaseOS",
+          "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
           "name": "baseos",
           "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.0-20220201"
         },
         {
-          "title": "RHEL-9-NIGHTLY-AppStream",
+          "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
           "name": "appstream",
           "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.0-20220201"
         },
         {
-          "title": "RHEL-9-NIGHTLY-CRB",
+          "title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
           "name": "crb",
           "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.0-20220201"
         }
diff --git a/schutzbot/sonarqube.sh b/schutzbot/sonarqube.sh
index f5d74f34e..018cf2224 100755
--- a/schutzbot/sonarqube.sh
+++ b/schutzbot/sonarqube.sh
@@ -10,7 +10,7 @@ curl "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scan
 unzip -q sonar-scanner-cli.zip
 
 SONAR_SCANNER_CMD="sonar-scanner-$SONAR_SCANNER_CLI_VERSION-linux/bin/sonar-scanner"
-SCANNER_OPTS="-Dsonar.projectKey=osbuild:osbuild-composer -Dsonar.sources=. -Dsonar.host.url=https://sonarqube.corp.redhat.com -Dsonar.login=$SONAR_SCANNER_TOKEN"
+SCANNER_OPTS="-Dsonar.projectKey=osbuild:osbuild-composer -Dsonar.sources=. -Dsonar.host.url=https://sonarqube.corp.redhat.com -Dsonar.login=$SONAR_SCANNER_TOKEN -Dsonar.c.file.suffixes=-"
 
 # add options for branch analysis if not running on main
 if [ "$CI_COMMIT_BRANCH" != "main" ];then