diff --git a/.vib/grafana-tempo-query/goss/goss.yaml b/.vib/grafana-tempo-query/goss/goss.yaml
new file mode 100644
index 000000000000..22ce3a0549b9
--- /dev/null
+++ b/.vib/grafana-tempo-query/goss/goss.yaml
@@ -0,0 +1,10 @@
+gossfile:
+  # Goss tests exclusive to the current container
+  ../../grafana-tempo-query/goss/grafana-tempo-query.yaml: {}
+  # Load scripts from .vib/common/goss/templates
+  ../../common/goss/templates/check-binaries.yaml: {}
+  ../../common/goss/templates/check-broken-symlinks.yaml: {}
+  ../../common/goss/templates/check-ca-certs.yaml: {}
+  ../../common/goss/templates/check-linked-libraries.yaml: {}
+  ../../common/goss/templates/check-sed-in-place.yaml: {}
+  ../../common/goss/templates/check-spdx.yaml: {}
diff --git a/.vib/grafana-tempo-query/goss/grafana-tempo-query.yaml b/.vib/grafana-tempo-query/goss/grafana-tempo-query.yaml
new file mode 100644
index 000000000000..d17000ab1e5e
--- /dev/null
+++ b/.vib/grafana-tempo-query/goss/grafana-tempo-query.yaml
@@ -0,0 +1,4 @@
+command:
+  check-tempo-query:
+    exec: /opt/bitnami/grafana-tempo-query/bin/tempo-query --help
+    exit-status: 0
diff --git a/.vib/grafana-tempo-query/goss/vars.yaml b/.vib/grafana-tempo-query/goss/vars.yaml
new file mode 100644
index 000000000000..4ab9c0afadda
--- /dev/null
+++ b/.vib/grafana-tempo-query/goss/vars.yaml
@@ -0,0 +1,3 @@
+binaries:
+  - tempo-query
+root_dir: /opt/bitnami
diff --git a/.vib/grafana-tempo-query/vib-publish.json b/.vib/grafana-tempo-query/vib-publish.json
index 8b6fe8eab4e6..2c31d5c92104 100644
--- a/.vib/grafana-tempo-query/vib-publish.json
+++ b/.vib/grafana-tempo-query/vib-publish.json
@@ -3,7 +3,8 @@
     "resources": {
       "url": "{VIB_ENV_CONTAINER_URL}",
       "path": "{VIB_ENV_PATH}"
-    }
+    },
+    "runtime_parameters": "Y29tbWFuZDogWyJ0YWlsIiwgIi1mIiwgIi9kZXYvbnVsbCJd"
   },
   "phases": {
     "package": {
@@ -33,6 +34,21 @@
     },
     "verify": {
       "actions": [
+        {
+          "action_id": "goss",
+          "params": {
+            "resources": {
+              "path": "/.vib"
+            },
+            "tests_file": "grafana-tempo-query/goss/goss.yaml",
+            "vars_file": "grafana-tempo-query/goss/vars.yaml",
+            "remote": {
+              "pod": {
+                "workload": "deploy-grafana-tempo-query"
+              }
+            }
+          }
+        },
         {
           "action_id": "trivy",
           "params": {
diff --git a/.vib/grafana-tempo-query/vib-verify.json b/.vib/grafana-tempo-query/vib-verify.json
index a34e8aee9161..51db3dc06d12 100644
--- a/.vib/grafana-tempo-query/vib-verify.json
+++ b/.vib/grafana-tempo-query/vib-verify.json
@@ -3,7 +3,8 @@
     "resources": {
       "url": "{SHA_ARCHIVE}",
       "path": "{VIB_ENV_PATH}"
-    }
+    },
+    "runtime_parameters": "Y29tbWFuZDogWyJ0YWlsIiwgIi1mIiwgIi9kZXYvbnVsbCJd"
   },
   "phases": {
     "package": {
@@ -29,6 +30,21 @@
     },
     "verify": {
       "actions": [
+        {
+          "action_id": "goss",
+          "params": {
+            "resources": {
+              "path": "/.vib"
+            },
+            "tests_file": "grafana-tempo-query/goss/goss.yaml",
+            "vars_file": "grafana-tempo-query/goss/vars.yaml",
+            "remote": {
+              "pod": {
+                "workload": "deploy-grafana-tempo-query"
+              }
+            }
+          }
+        },
         {
           "action_id": "trivy",
           "params": {