diff --git a/.gitea/workflows/build-publish.yaml b/.gitea/workflows/build-publish.yaml
index 0cf5e86..2761ec7 100644
--- a/.gitea/workflows/build-publish.yaml
+++ b/.gitea/workflows/build-publish.yaml
@@ -8,20 +8,27 @@ jobs:
   docker:
     strategy:
       matrix:
-        arch: ['arm64', 'amd64']
+        arch: ['ubuntu-latest', 'arm-ubuntu-latest']
         go-version: ['1.20']
         git-version: ['2.38.4']
         golangci-lint-version: ['1.51.0']
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.arch }}
     steps:
     - uses: actions/checkout@v3
+    - run: |
+        if [ "${{ matrix.arch }}" == "ubuntu-latest" ]; then
+          echo ::set-output name=value::amd64
+        else
+          echo ::set-output name=value::arm64
+        fi
+      id: arch
     - name: setup buildx
       uses: https://github.com/docker/setup-buildx-action@v2
     - name: build image
       uses: https://github.com/docker/build-push-action@v4
       with:
         push: false
-        tags: gitea/test_env:linux-${{ matrix.arch }}
+        tags: gitea/test_env:linux-${{ matrix.go-version }}-${{ steps.arch.outputs.value }}
         build-args: |
           GOLANG_VERSION=${{ matrix.go-version }}
           GIT_VERSION=${{ matrix.git-version }}
diff --git a/.gitea/workflows/dry-run.yaml b/.gitea/workflows/dry-run.yaml
index 00e99fa..2ed5ae5 100644
--- a/.gitea/workflows/dry-run.yaml
+++ b/.gitea/workflows/dry-run.yaml
@@ -7,27 +7,19 @@ jobs:
   docker:
     strategy:
       matrix:
-        arch: ['ubuntu-latest', 'arm-ubuntu-latest']
         go-version: ['1.20']
         git-version: ['2.38.4']
         golangci-lint-version: ['1.51.0']
-    runs-on: arm-ubuntu-latest
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - run: |
-        if [ "${{ matrix.arch }}" == "ubuntu-latest" ]; then
-          echo ::set-output name=value::amd64
-        else
-          echo ::set-output name=value::arm64
-        fi
-      id: arch
     - name: setup buildx
       uses: https://github.com/docker/setup-buildx-action@v2
     - name: build image
       uses: https://github.com/docker/build-push-action@v4
       with:
         push: false
-        tags: gitea/test_env:linux-${{ matrix.go-version }}-${{ steps.arch.outputs.value }}
+        tags: gitea/test_env:linux-${{ matrix.go-version }}-amd64
         build-args: |
           GOLANG_VERSION=${{ matrix.go-version }}
           GIT_VERSION=${{ matrix.git-version }}