diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index c5bf7ca93..4ef26f1e8 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -104,6 +104,12 @@ jobs:
       - name: Expose GitHub Runtime
         uses: crazy-max/ghaction-github-runtime@v3.0.0
 
+      - name: Compute SemVer parts of Keycloak version
+        id: keycloak_semver
+        uses: madhead/semver-utils@v3
+        with:
+          version: ${{ matrix.env.KEYCLOAK_VERSION }}
+
       - name: Set up Docker Build Metadata
         id: docker_meta
         uses: docker/metadata-action@v5.5.1
@@ -117,6 +123,9 @@ jobs:
             type=ref,event=pr
             type=semver,event=tag,pattern={{version}}
             type=raw,event=tag,value=latest,enable=${{ !contains(github.ref_name, 'rc') }}
+            # alias tags without Keycloak minor/patch version
+            type=semver,event=tag,pattern={{version}},suffix=-${{ steps.keycloak_semver.outputs.major }}
+            type=raw,event=tag,value=latest,enable=${{ !contains(github.ref_name, 'rc') }},suffix=-${{ steps.keycloak_semver.outputs.major }}
           labels: |
             maintainer=adorsys GmbH & Co. KG
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8dc24e901..26b5e79d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Updated CI to use Keycloak 25.0.1
 - Identity Providers are now updated using the name of policies, scopes and resources
 
+### Added
+- Alias docker tags without Keycloak minor/patch version
+
 ### Fixed
 - Importing more than 10 subgroups into a realm
 
@@ -55,9 +58,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Extended maven-replacer-plugin with breaking changes
 - Using util classes as replacement strategy for breaking changes (GroupUtil, SubGroupUtil)
 
-### Added
-- Alias docker tags without Keycloak minor/patch version
-
 ## [5.9.0] - 2023-10-13
 - Updated CI to use Keycloak 22.0.4