diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 465d3a9a..f090f37c 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -9,8 +9,13 @@ body:
 
   - type: input
     attributes:
-      label: Affected version
-      description: Which version do you see this bug in?
+      label: Affected Stackable version
+      description: Which version of the Stackable Operator do you see this bug in?
+
+  - type: input
+    attributes:
+      label: Affected Apache Hive version
+      description: Which version of Apache Hive do you see this bug in?
 
   - type: textarea
     attributes:
diff --git a/Tiltfile b/Tiltfile
index 4d9cc0e8..beb59022 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -22,6 +22,11 @@ watch_file('result')
 if os.path.exists('result'):
    k8s_yaml('result/crds.yaml')
 
+# We need to set the correct image annotation on the operator Deployment to use e.g.
+# docker.stackable.tech/sandbox/opa-operator:7y19m3d8clwxlv34v5q2x4p7v536s00g instead of
+# docker.stackable.tech/sandbox/opa-operator:0.0.0-dev (which does not exist)
+k8s_kind('Deployment', image_json_path='{.spec.template.metadata.annotations.internal\\.stackable\\.tech/image}')
+
 # Exclude stale CRDs from Helm chart, and apply the rest
 helm_crds, helm_non_crds = filter_yaml(
    helm(