diff --git a/.vib/os-shell/goss/os-shell.yaml b/.vib/os-shell/goss/os-shell.yaml
index ff963ebf2eec..08dc0be72500 100644
--- a/.vib/os-shell/goss/os-shell.yaml
+++ b/.vib/os-shell/goss/os-shell.yaml
@@ -3,7 +3,5 @@
 
 command:
   check-distro-version:
-    exec: grep VERSION_ID /etc/os-release
+    exec: grep VERSION_ID /etc/os-release | grep "$(echo "$APP_VERSION" | sed -E 's|^([0-9]+).*$|\1|g')"
     exit-status: 0
-    stdout:
-      - {{ .Env.APP_VERSION }}