From 13ee67e58e51a58e1e287bec7ebb5e7326e7e0ac Mon Sep 17 00:00:00 2001
From: ma-04 <120931948+ma-04@users.noreply.github.com>
Date: Thu, 14 May 2026 11:08:42 +0600
Subject: [PATCH 1/2] fix typo

---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index f8acc91fc6..81847b6a7b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -31,7 +31,7 @@ jobs:
         with:
           # list of Docker images to use as base name for tags
           images: |
-            ${{ env.DOCKER_ORG_USERNAME }}/ofelia
+            ${{ vars.DOCKER_ORG_USERNAME }}/ofelia
           # ghcr.io/${{ github.repository }}
           flavor: |
             latest=false

From 3e8e6e0363de0cb600265d464b2e63fab27fb224 Mon Sep 17 00:00:00 2001
From: ma-04 <120931948+ma-04@users.noreply.github.com>
Date: Thu, 14 May 2026 11:25:48 +0600
Subject: [PATCH 2/2] fix(ci): use vars.DOCKER_ORG_USERNAME and simplify docker
 metadata tags

---
 .github/workflows/docker.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 81847b6a7b..ef7752f259 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -34,13 +34,12 @@ jobs:
             ${{ vars.DOCKER_ORG_USERNAME }}/ofelia
           # ghcr.io/${{ github.repository }}
           flavor: |
-            latest=false
+            latest=auto
           tags: |
-            type=raw,value=development,enable=${{ github.event_name != 'release' }}
-            type=raw,value=latest,enable=${{ github.event_name == 'release' && !github.event.release.prerelease }}
+            type=raw,value=development,enable={{is_default_branch}}
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
-            type=sha,enable=true,priority=100,prefix=,suffix=,format=short
+            type=sha,prefix=
 
       - name: Login to DockerHub
         uses: docker/login-action@v3