diff --git a/.gitea/ISSUE_TEMPLATE/bug.yaml b/.gitea/ISSUE_TEMPLATE/bug.yaml
index e4ffc08..d0ccf70 100644
--- a/.gitea/ISSUE_TEMPLATE/bug.yaml
+++ b/.gitea/ISSUE_TEMPLATE/bug.yaml
@@ -5,35 +5,28 @@ body:
   - type: dropdown
     id: build_type
     attributes:
-      label: "Build type (`docker-finance build`)"
+      label: "Build type | $ dfi <platform/${USER}:tag> build"
       options:
         - default
         - slim
         - tiny
         - micro
-  - type: dropdown
-    id: version
-    attributes:
-      label: "Release version or master (branch)"
-      options:
-        - master (branch)
-        - v1.0.0-beta
-    validations:
-      required: true
-  - type: textarea
-    id: version_hash
-    attributes:
-      label: "If running master (branch), what commit hash?"
-      placeholder: "$ git log --pretty=oneline -n 1"
-      render: shell
   - type: textarea
     id: version_output
     attributes:
-      label: "Output of client (host) `version` command"
-      placeholder: "$ docker-finance version type=all"
+      label: "Version | $ dfi <platform/${USER}:tag> version"
+      placeholder: "$ dfi archlinux/${USER}:default version type=short"
       render: shell
     validations:
-      required: true
+      required: false
+  - type: textarea
+    id: version_hash
+    attributes:
+      label: "If the above `version` command is not working, what repo commit hash?"
+      placeholder: "$ git log --pretty=oneline -n 1"
+      render: shell
+    validations:
+      required: false
   - type: textarea
     id: description
     attributes: