diff --git a/.github/workflows/backend.yml b/.github/workflows/backend-image.yml
similarity index 96%
rename from .github/workflows/backend.yml
rename to .github/workflows/backend-image.yml
index c46a374e3b..09edea51be 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend-image.yml
@@ -46,7 +46,7 @@ jobs:
       - name: Generate files hash
         id: files-hash
         run: |
-          DIR_HASH=$(echo -n ${{ hashFiles('backend/**', '.github/workflows/backend.yml') }})
+          DIR_HASH=$(echo -n ${{ hashFiles('backend/**', '.github/workflows/backend-image.yml') }})
           echo "DIR_HASH=$DIR_HASH${{ env.BUILD_ARM && '-arm'|| '' }}" >> $GITHUB_ENV
 
       - name: Setup Docker metadata
@@ -59,6 +59,7 @@ jobs:
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
             type=ref,event=branch
             type=sha,prefix=commit-
+            type=raw,value=${{ env.BRANCH_NAME }}-arm,enable=${{ env.BUILD_ARM }}
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
diff --git a/.github/workflows/build-arm.yaml b/.github/workflows/build-arm-images.yaml
similarity index 100%
rename from .github/workflows/build-arm.yaml
rename to .github/workflows/build-arm-images.yaml
diff --git a/.github/workflows/config-preprocessor-build.yml b/.github/workflows/config-preprocessor-image.yml
similarity index 100%
rename from .github/workflows/config-preprocessor-build.yml
rename to .github/workflows/config-preprocessor-image.yml
diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-test.yml
similarity index 100%
rename from .github/workflows/docs-build.yml
rename to .github/workflows/docs-test.yml
diff --git a/.github/workflows/dummyPreprocessing.yml b/.github/workflows/dummy-preprocessing-image.yml
similarity index 98%
rename from .github/workflows/dummyPreprocessing.yml
rename to .github/workflows/dummy-preprocessing-image.yml
index f48709f633..ef5320a0e4 100644
--- a/.github/workflows/dummyPreprocessing.yml
+++ b/.github/workflows/dummy-preprocessing-image.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Generate files hash
         id: files-hash
         run: |
-          DIR_HASH=$(echo -n ${{ hashFiles('preprocessing/dummy/**', '.github/workflows/dummyPreprocessing.yml') }})
+          DIR_HASH=$(echo -n ${{ hashFiles('preprocessing/dummy/**', '.github/workflows/dummy-preprocessing-image.yml') }})
           echo "DIR_HASH=$DIR_HASH${{ env.BUILD_ARM && '-arm'|| '' }}" >> $GITHUB_ENV
 
       - name: Setup Docker metadata
diff --git a/.github/workflows/ingest.yml b/.github/workflows/ingest-image.yml
similarity index 98%
rename from .github/workflows/ingest.yml
rename to .github/workflows/ingest-image.yml
index 211cdbf416..3e48317279 100644
--- a/.github/workflows/ingest.yml
+++ b/.github/workflows/ingest-image.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Generate files hash
         id: files-hash
         run: |
-          DIR_HASH=$(echo -n ${{ hashFiles('ingest/**', '.github/workflows/ingest.yml') }})
+          DIR_HASH=$(echo -n ${{ hashFiles('ingest/**', '.github/workflows/ingest-image.yml') }})
           echo "DIR_HASH=$DIR_HASH${{ env.BUILD_ARM && '-arm'|| '' }}" >> $GITHUB_ENV
 
       - name: Setup Docker metadata
diff --git a/.github/workflows/keycloakify-build.yml b/.github/workflows/keycloakify-image.yml
similarity index 98%
rename from .github/workflows/keycloakify-build.yml
rename to .github/workflows/keycloakify-image.yml
index e8d9273f67..bae45ead8a 100644
--- a/.github/workflows/keycloakify-build.yml
+++ b/.github/workflows/keycloakify-image.yml
@@ -48,7 +48,7 @@ jobs:
       - name: Generate files hash
         id: files-hash
         run: |
-          DIR_HASH=$(echo -n ${{ hashFiles('./keycloak/keycloakify/**','.github/workflows/keycloakify-build.yml') }})
+          DIR_HASH=$(echo -n ${{ hashFiles('./keycloak/keycloakify/**','.github/workflows/keycloakify-image.yml') }})
           echo "DIR_HASH=$DIR_HASH${{ env.BUILD_ARM && '-arm'|| '' }}" >> $GITHUB_ENV
       - name: Setup Docker metadata
         id: dockerMetadata
diff --git a/.github/workflows/preprocessing-nextclade.yml b/.github/workflows/preprocessing-nextclade.yml
index 4ba0722def..df81150b05 100644
--- a/.github/workflows/preprocessing-nextclade.yml
+++ b/.github/workflows/preprocessing-nextclade.yml
@@ -44,7 +44,7 @@ jobs:
       - name: Generate files hash
         id: files-hash
         run: |
-          DIR_HASH=$(echo -n ${{ hashFiles('preprocessing/nextclade/**', '.github/workflows/preprocessing-nextclade.yml') }})
+          DIR_HASH=$(echo -n ${{ hashFiles('preprocessing/nextclade/**', '.github/workflows/preprocessing-nextclade-image.yml') }})
           echo "DIR_HASH=$DIR_HASH${{ env.BUILD_ARM && '-arm'|| '' }}" >> $GITHUB_ENV
 
       - name: Setup Docker metadata
diff --git a/.github/workflows/website.yml b/.github/workflows/website-image.yml
similarity index 96%
rename from .github/workflows/website.yml
rename to .github/workflows/website-image.yml
index e75b9b3345..0d31b98a83 100644
--- a/.github/workflows/website.yml
+++ b/.github/workflows/website-image.yml
@@ -43,8 +43,8 @@ jobs:
       - name: Generate files hash
         id: files-hash
         run: |
-          DIR_HASH=$(echo -n ${{ hashFiles('website/**', '.github/workflows/website.yml') }})
-          echo "DIR_HASH=$NON_ARM_HASH" >> $GITHUB_ENV
+          DIR_HASH=$(echo -n ${{ hashFiles('website/**', '.github/workflows/website-image.yml') }})
+          echo "DIR_HASH=$DIR_HASH${{ env.BUILD_ARM && '-arm'|| '' }}" >> $GITHUB_ENV
 
       - name: Setup Docker metadata
         id: dockerMetadata
diff --git a/.github/workflows/node_dev.yml b/.github/workflows/website-playwright-dev-test.yml
similarity index 95%
rename from .github/workflows/node_dev.yml
rename to .github/workflows/website-playwright-dev-test.yml
index 3be0c74bc2..59bd6bf275 100644
--- a/.github/workflows/node_dev.yml
+++ b/.github/workflows/website-playwright-dev-test.yml
@@ -25,8 +25,8 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - windows-latest
-        #disabled - macos-latest
+        #  - windows-latest
+        #  - macos-latest
         exclude:
           - os: ${{ github.ref != 'refs/heads/main' && 'macos-latest' }}