diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index 77aebbb..97ee6f8 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -30,15 +30,15 @@ jobs:
           echo "GITHUB_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
         fi
 
-    - name: lint dockerfile
-      run: docker run --rm -v "$PWD/Dockerfile:/Dockerfile:ro" redcoolbeans/dockerlint
-
     - name: Set up Docker QEMU
       uses: docker/setup-qemu-action@v2
     - name: Set up Docker Buildx
       id: buildx
       uses: docker/setup-buildx-action@v2
 
+    - name: lint dockerfile
+      run: docker run --rm -v "$PWD/Dockerfile:/Dockerfile:ro" redcoolbeans/dockerlint
+      
     - name: Build and export to Docker
       uses: docker/build-push-action@v4
       with:
@@ -50,23 +50,23 @@ jobs:
     #  run: |
     #    docker run --rm ${{ github.repository }}:test
           
-    - name: Login to Docker Hub
-      if: ${{ env.GITHUB_BRANCH == 'master' || startsWith(env.GITHUB_TAG, 'v')  }}
+    - if: ${{ env.GITHUB_BRANCH == 'master' || startsWith(env.GITHUB_TAG, 'v') }}
+      name: Login to Docker Hub
       uses: docker/login-action@v2
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_PASSWORD }}
       
-    - name: Login to GitHub Container Registry
-      if: ${{ env.GITHUB_BRANCH == 'master' || startsWith(env.GITHUB_TAG, 'v') }}
+    - if: ${{ env.GITHUB_BRANCH == 'master' || startsWith(env.GITHUB_TAG, 'v') }}
+      name: Login to GitHub Container Registry
       uses: docker/login-action@v2
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
         
-    - name: Extract metadata (tags, labels) for Docker
-      if: ${{ env.GITHUB_BRANCH == 'master' || startsWith(env.GITHUB_TAG, 'v') }}
+    - if: ${{ env.GITHUB_BRANCH == 'master' || startsWith(env.GITHUB_TAG, 'v') }}
+      name: Extract metadata (tags, labels) for Docker
       id: meta
       uses: docker/metadata-action@v4
       with:
@@ -74,15 +74,14 @@ jobs:
           ${{ github.repository }}
           ghcr.io/${{ github.repository }}
         tags: |
-            type=schedule
+            type=edge
             type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}.{{patch}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
-            type=sha
             
-    - name: Build and push Docker image
+    - if: ${{ env.GITHUB_BRANCH == 'master' || startsWith(env.GITHUB_TAG, 'v') }}
+      name: Build and push Docker image
       uses: docker/build-push-action@v4
       with:
         context: .