diff --git a/.github/workflows/deploy-docker-all.yml b/.github/workflows/deploy-docker-all.yml
index 375f6e50..05238dd4 100755
--- a/.github/workflows/deploy-docker-all.yml
+++ b/.github/workflows/deploy-docker-all.yml
@@ -399,6 +399,9 @@ jobs:
 
                       #  tag            add tag-arm64
                       type=ref,enable=${{ github.event_name == 'pull_request' || github.event_name == 'push' }},priority=600,prefix=,suffix=-arm64,event=tag
+
+                      #  tag            add arm64
+                      type=raw,enable=false,priority=100,value=arm64
                   flavor: |
                       latest=false
                   labels: |
@@ -653,11 +656,14 @@ jobs:
                       #  dispatch       add amd64-development
                       type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == true }},priority=300,prefix=,suffix=-amd64,value=development
 
-                      #  tag            add tag-arm64
+                      #  tag            add tag-amd64
                       type=ref,enable=${{ github.event_name == 'pull_request' || github.event_name == 'push' }},priority=600,prefix=,suffix=-amd64,event=tag
 
                       #  add development tag to default architecture (amd64)
                       type=raw,enable=${{ inputs.DEV_RELEASE }},priority=400,prefix=,suffix=,value=development
+
+                      #  tag            add amd64
+                      type=raw,enable=false,priority=100,value=amd64
                   flavor: |
                       latest=${{ !inputs.DEV_RELEASE }}
                   labels: |
@@ -914,6 +920,9 @@ jobs:
 
                       #  tag            add tag-arm64
                       type=ref,enable=${{ github.event_name == 'pull_request' || github.event_name == 'push' }},priority=600,prefix=,suffix=-arm64,event=tag
+
+                      #  tag            add arm64
+                      type=raw,enable=false,priority=100,value=arm64
                   flavor: |
                       latest=false
                   labels: |
@@ -1167,11 +1176,14 @@ jobs:
                       #  dispatch       add amd64-development
                       type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == true }},priority=300,prefix=,suffix=-amd64,value=development
 
-                      #  tag            add tag-arm64
+                      #  tag            add tag-amd64
                       type=ref,enable=${{ github.event_name == 'pull_request' || github.event_name == 'push' }},priority=600,prefix=,suffix=-amd64,event=tag
 
                       #  add development tag to default architecture (amd64)
                       type=raw,enable=${{ inputs.DEV_RELEASE }},priority=400,prefix=,suffix=,value=development
+
+                      #  tag            add amd64
+                      type=raw,enable=false,priority=100,value=amd64
                   flavor: |
                       latest=${{ !inputs.DEV_RELEASE }}
                   labels: |
@@ -1429,6 +1441,9 @@ jobs:
 
                       #  tag            add tag-arm64
                       type=ref,enable=${{ github.event_name == 'pull_request' || github.event_name == 'push' }},priority=600,prefix=,suffix=-arm64,event=tag
+
+                      #  tag            add arm64
+                      type=raw,enable=false,priority=100,value=arm64
                   flavor: |
                       latest=false
                   labels: |
@@ -1683,11 +1698,14 @@ jobs:
                       #  dispatch       add amd64-development
                       type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == true }},priority=300,prefix=,suffix=-amd64,value=development
 
-                      #  tag            add tag-arm64
+                      #  tag            add tag-amd64
                       type=ref,enable=${{ github.event_name == 'pull_request' || github.event_name == 'push' }},priority=600,prefix=,suffix=-amd64,event=tag
 
                       #  add development tag to default architecture (amd64)
                       type=raw,enable=${{ inputs.DEV_RELEASE }},priority=400,prefix=,suffix=,value=development
+
+                      #  tag            add amd64
+                      type=raw,enable=false,priority=100,value=amd64
                   flavor: |
                       latest=${{ !inputs.DEV_RELEASE }}
                   labels: |
diff --git a/.github/workflows/deploy-docker-dockerhub.yml b/.github/workflows/deploy-docker-dockerhub.yml
index 67f7190d..b8773b5f 100755
--- a/.github/workflows/deploy-docker-dockerhub.yml
+++ b/.github/workflows/deploy-docker-dockerhub.yml
@@ -344,6 +344,9 @@ jobs:
 
                       #  tag            add tag-arm64
                       type=ref,enable=${{ github.event_name == 'pull_request' || github.event_name == 'push' }},priority=600,prefix=,suffix=-arm64,event=tag
+
+                      #  tag            add arm64
+                      type=raw,enable=false,priority=100,value=arm64
                   flavor: |
                       latest=false
                   labels: |
@@ -602,6 +605,9 @@ jobs:
 
                       #  add development tag to default architecture (amd64)
                       type=raw,enable=${{ inputs.DEV_RELEASE }},priority=400,prefix=,suffix=,value=development
+
+                      #  tag            add amd64
+                      type=raw,enable=false,priority=100,value=amd64
                   flavor: |
                       latest=${{ !inputs.DEV_RELEASE }}
                   labels: |
diff --git a/.github/workflows/deploy-docker-gitea.yml b/.github/workflows/deploy-docker-gitea.yml
index 71c874c2..1a1ac06e 100755
--- a/.github/workflows/deploy-docker-gitea.yml
+++ b/.github/workflows/deploy-docker-gitea.yml
@@ -344,6 +344,9 @@ jobs:
 
                       #  tag            add tag-arm64
                       type=ref,enable=${{ github.event_name == 'pull_request' || github.event_name == 'push' }},priority=600,prefix=,suffix=-arm64,event=tag
+
+                      #  tag            add arm64
+                      type=raw,enable=false,priority=100,value=arm64
                   flavor: |
                       latest=false
                   labels: |
@@ -598,11 +601,14 @@ jobs:
                       #  dispatch       add amd64-development
                       type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == true }},priority=300,prefix=,suffix=-amd64,value=development
 
-                      #  tag            add tag-arm64
+                      #  tag            add tag-amd64
                       type=ref,enable=${{ github.event_name == 'pull_request' || github.event_name == 'push' }},priority=600,prefix=,suffix=-amd64,event=tag
 
                       #  add development tag to default architecture (amd64)
                       type=raw,enable=${{ inputs.DEV_RELEASE }},priority=400,prefix=,suffix=,value=development
+
+                      #  tag            add amd64
+                      type=raw,enable=false,priority=100,value=amd64
                   flavor: |
                       latest=${{ !inputs.DEV_RELEASE }}
                   labels: |
diff --git a/.github/workflows/deploy-docker-github.yml b/.github/workflows/deploy-docker-github.yml
index 9ef73bc6..6f5095a9 100755
--- a/.github/workflows/deploy-docker-github.yml
+++ b/.github/workflows/deploy-docker-github.yml
@@ -342,6 +342,9 @@ jobs:
 
                       #  tag            add tag-arm64
                       type=ref,enable=${{ github.event_name == 'pull_request' || github.event_name == 'push' }},priority=600,prefix=,suffix=-arm64,event=tag
+
+                      #  tag            add arm64
+                      type=raw,enable=false,priority=100,value=arm64
                   flavor: |
                       latest=false
                   labels: |
@@ -594,11 +597,14 @@ jobs:
                       #  dispatch       add amd64-development
                       type=raw,enable=${{ github.event_name == 'workflow_dispatch' && inputs.DEV_RELEASE == true }},priority=300,prefix=,suffix=-amd64,value=development
 
-                      #  tag            add tag-arm64
+                      #  tag            add tag-amd64
                       type=ref,enable=${{ github.event_name == 'pull_request' || github.event_name == 'push' }},priority=600,prefix=,suffix=-amd64,event=tag
 
                       #  add development tag to default architecture (amd64)
                       type=raw,enable=${{ inputs.DEV_RELEASE }},priority=400,prefix=,suffix=,value=development
+
+                      #  tag            add amd64
+                      type=raw,enable=false,priority=100,value=amd64
                   flavor: |
                       latest=${{ !inputs.DEV_RELEASE }}
                   labels: |