diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index a35b724..1529c5f 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -33,6 +33,32 @@ body:
     label: 'Debug log output'
     description: 'Paste the debug log output here. See https://github.com/GoogleCloudPlatform/gcr-cleaner#Debugging for more information.'
     render: 'text'
+    
+- id: 'mode'
+  type: 'dropdown'
+  attributes:
+    label: 'How are you running gcr-cleaner?'
+    options:
+      - 'CLI'
+      - 'Server'
+  validations:
+    required: true
+
+- id: 'version'
+  type: 'input'
+  attributes:
+    label: 'gcr-cleaner version'
+    description: 'Version of gcr-cleaner. If using the CLI, run `gcr-cleaner -v`. If using the server, check the debug logs or provide the container SHA'
+  validations:
+    required: true
+
+- id: 'environment'
+  type: 'textarea'
+  attributes:
+    label: 'Environment'
+    description: 'Provide as much information about your environment as possible. If you are using gcr-cleaner as a CLI, include local operating system information. If you are running gcr-cleaner as a service, describe the deployment topology, permissions, and runtime.'
+  validations:
+    required: true
 
 - id: 'additional'
   type: 'textarea'