diff --git a/.github/workflows/build-base-images.yml b/.github/actions/build-images/base.yml
similarity index 100%
rename from .github/workflows/build-base-images.yml
rename to .github/actions/build-images/base.yml
diff --git a/.github/workflows/build-service-images.yml b/.github/actions/build-images/service.yml
similarity index 100%
rename from .github/workflows/build-service-images.yml
rename to .github/actions/build-images/service.yml
diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index 7148ddf..1aef787 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -72,7 +72,7 @@ jobs:
   base-images:
     name: 🛢️ Build base images (multi-arch)
     needs: build-go-matrix
-    uses: ./.github/workflows/build-base-images.yml
+    uses: ./.github/actions/build-images/base.yml
     with:
       push_images: ${{ github.event_name != 'pull_request' }}
     secrets: inherit
@@ -82,7 +82,7 @@ jobs:
     needs:
       - build-go-matrix
       - base-images
-    uses: ./.github/workflows/build-service-images.yml
+    uses: ./.github/actions/build-images/serive.yml
     with:
       push_images: ${{ github.event_name != 'pull_request' }}
     secrets: inherit