diff --git a/Dockerfile b/Dockerfile
index a4bd890..0621b30 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,8 +14,12 @@
 # You can contact the BCI team via https://github.com/SUSE/bci/discussions
 
 
-#!BuildTag: opensuse/grafana:%%grafana_version%%
-#!BuildTag: opensuse/grafana:%%grafana_version%%-%RELEASE%
+#!BuildTag: opensuse/grafana:%%grafana_patch_version%%
+#!BuildTag: opensuse/grafana:%%grafana_patch_version%%-%RELEASE%
+#!BuildTag: opensuse/grafana:%%grafana_minor_version%%
+#!BuildTag: opensuse/grafana:%%grafana_minor_version%%-%RELEASE%
+#!BuildTag: opensuse/grafana:%%grafana_major_version%%
+#!BuildTag: opensuse/grafana:%%grafana_major_version%%-%RELEASE%
 #!BuildTag: opensuse/grafana:latest
 
 FROM opensuse/tumbleweed:latest
@@ -26,12 +30,12 @@ MAINTAINER openSUSE (https://www.opensuse.org/)
 # labelprefix=org.opensuse.application.grafana
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed Grafana"
 LABEL org.opencontainers.image.description="Grafana container based on the openSUSE Tumbleweed Base Container Image."
-LABEL org.opencontainers.image.version="%%grafana_version%%"
+LABEL org.opencontainers.image.version="%%grafana_patch_version%%"
 LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/grafana:%%grafana_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/grafana:%%grafana_patch_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime"
 LABEL org.opensuse.release-stage="released"
diff --git a/_service b/_service
index 3e43ea4..5cee832 100644
--- a/_service
+++ b/_service
@@ -3,7 +3,19 @@
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
   <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
-    <param name="regex">%%grafana_version%%</param>
+    <param name="regex">%%grafana_major_version%%</param>
+    <param name="package">grafana</param>
+    <param name="parse-version">major</param>
+  </service>
+  <service name="replace_using_package_version" mode="buildtime">
+    <param name="file">Dockerfile</param>
+    <param name="regex">%%grafana_minor_version%%</param>
+    <param name="package">grafana</param>
+    <param name="parse-version">minor</param>
+  </service>
+  <service name="replace_using_package_version" mode="buildtime">
+    <param name="file">Dockerfile</param>
+    <param name="regex">%%grafana_patch_version%%</param>
     <param name="package">grafana</param>
     <param name="parse-version">patch</param>
   </service>
diff --git a/grafana-image.changes b/grafana-image.changes
index 0cd3fd7..94540c7 100644
--- a/grafana-image.changes
+++ b/grafana-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jun 18 08:57:23 UTC 2024 - Dan Čermák <dcermak@suse.com>
+
+- Add major and major+minor version as a build tag
+
 -------------------------------------------------------------------
 Mon Jun 10 15:11:25 UTC 2024 - Dirk Mueller <dmueller@suse.com>