diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 53af08c54b..e25b390db5 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -80,6 +80,16 @@ body:
         $(snap info authd-msentraid 2>/dev/null)
         \`\`\`
 
+        #### authd-google broker version
+        \`\`\`
+        $(snap info authd-google 2>/dev/null)
+        \`\`\`
+
+        #### authd-oidc broker version
+        \`\`\`
+        $(snap info authd-oidc 2>/dev/null)
+        \`\`\`
+
         #### gnome-shell version
         \`\`\`
         $(apt policy gnome-shell 2>/dev/null)
@@ -117,11 +127,19 @@ body:
         \`\`\`
         $(sudo cat 2>&1 /var/snap/authd-msentraid/current/broker.conf | sed -E 's/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/<UUID redacted>/g')
         \`\`\`
+        $(sudo sh -c 'for f in /var/snap/authd-msentraid/current/broker.conf.d/*.conf; do [ -f "$f" ] && echo "##### $f" && echo "\`\`\`" && cat "$f" && echo "\`\`\`"; done' 2>/dev/null | sed -E 's/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/<UUID redacted>/g')
 
         #### authd-google configuration
         \`\`\`
         $(sudo cat 2>&1 /var/snap/authd-google/current/broker.conf | sed -E 's/client_id = .*/client_id = <redacted>/g' | sed -E 's/client_secret = .*/client_secret = <redacted>/g')
         \`\`\`
+        $(sudo sh -c 'for f in /var/snap/authd-google/current/broker.conf.d/*.conf; do [ -f "$f" ] && echo "##### $f" && echo "\`\`\`" && cat "$f" && echo "\`\`\`"; done' 2>/dev/null | sed -E 's/client_id = .*/client_id = <redacted>/g' | sed -E 's/client_secret = .*/client_secret = <redacted>/g')
+
+        #### authd-oidc configuration
+        \`\`\`
+        $(sudo cat 2>&1 /var/snap/authd-oidc/current/broker.conf | sed -E 's/client_id = .*/client_id = <redacted>/g' | sed -E 's/client_secret = .*/client_secret = <redacted>/g')
+        \`\`\`
+        $(sudo sh -c 'for f in /var/snap/authd-oidc/current/broker.conf.d/*.conf; do [ -f "$f" ] && echo "##### $f" && echo "\`\`\`" && cat "$f" && echo "\`\`\`"; done' 2>/dev/null | sed -E 's/client_id = .*/client_id = <redacted>/g' | sed -E 's/client_secret = .*/client_secret = <redacted>/g')
 
         EOF
         ```