diff --git a/.github/workflows/detect-breaking-changes-levitate.yml b/.github/workflows/detect-breaking-changes-levitate.yml
index 0cca7c5e785..ad0fcdbcdcf 100644
--- a/.github/workflows/detect-breaking-changes-levitate.yml
+++ b/.github/workflows/detect-breaking-changes-levitate.yml
@@ -141,6 +141,7 @@ jobs:
         with:
           workload_identity_provider: ${{ secrets.WIF_PROVIDER }}
           service_account: ${{ secrets.LEVITATE_SA }}
+          project_id: 'grafanalabs-global'
 
       - name: 'Set up Cloud SDK'
         uses: 'google-github-actions/setup-gcloud@v2'
@@ -149,16 +150,6 @@ jobs:
           project_id: 'grafanalabs-global'
           install_components: 'bq'
 
-        # This step is needed to generate a detailed levitate report
-      - name: Set up gcloud project
-        run: |
-          unset CLOUDSDK_CORE_PROJECT
-          unset GCLOUD_PROJECT
-          unset GCP_PROJECT
-          unset GOOGLE_CLOUD_PROJECT
-
-          gcloud config set project grafanalabs-global
-
       - name: Get link for the Github Action job
         id: job
         uses: actions/github-script@v6
diff --git a/scripts/levitate-show-affected-plugins.js b/scripts/levitate-show-affected-plugins.js
index 85e3eeab560..bf7bc7b6b50 100644
--- a/scripts/levitate-show-affected-plugins.js
+++ b/scripts/levitate-show-affected-plugins.js
@@ -79,7 +79,7 @@ function makeQuery(section) {
   }
 
   return `
-    SELECT
+    SELECT DISTINCT
       property_name,
       package_name,
       plugin_id
@@ -159,6 +159,12 @@ function printAffectedPluginsSection(data) {
     }
   } catch (error) {
     markdown += `<h4>Error generating detailed report ${error}</h4>`;
+    if (error.stdout) {
+      markdown += `<h5>Error stdout ${error.stdout}</h5>`;
+    }
+    if (error.stderr) {
+      markdown += `<h5>Error stderr ${error.stderr}</h5>`;
+    }
   }
 
   return markdown;