diff --git a/.github/workflows/automic-build-data-process-dev.yml b/.github/workflows/auto-build-data-process-dev.yml
similarity index 54%
rename from .github/workflows/automic-build-data-process-dev.yml
rename to .github/workflows/auto-build-data-process-dev.yml
index 6e75e6179..c9885170e 100644
--- a/.github/workflows/automic-build-data-process-dev.yml
+++ b/.github/workflows/auto-build-data-process-dev.yml
@@ -12,27 +12,19 @@ on:
       - 'backend/**'
       - 'sdk/**'
       - 'make/data_process/**'
+      - '.github/workflows/**'
   push:
     branches: [develop]
     paths:
       - 'backend/**'
       - 'sdk/**'
       - 'make/data_process/**'
+      - '.github/workflows/**'
 
 jobs:
   build-data-process-amd64:
     runs-on: ubuntu-latest
     steps:
-      - name: Free up disk space on GitHub runner
-        run: |
-          sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
-      - name: Set up Docker Buildx
-        run: |
-          if ! docker buildx inspect nexent_builder > /dev/null 2>&1; then
-            docker buildx create --name nexent_builder --use
-          else
-            docker buildx use nexent_builder
-          fi
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Clone model
@@ -43,21 +35,11 @@ jobs:
           rm -rf .git .gitattributes
       - name: Build data process image (amd64) and load locally
         run: |
-          docker buildx build --platform linux/amd64 -t nexent/nexent-data-process:dev-amd64 --load -f make/data_process/Dockerfile .
+          docker build --platform linux/amd64 -t nexent/nexent-data-process:dev-amd64 -f make/data_process/Dockerfile .
 
   build-data-process-arm64:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     steps:
-      - name: Free up disk space on GitHub runner
-        run: |
-          sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
-      - name: Set up Docker Buildx
-        run: |
-          if ! docker buildx inspect nexent_builder > /dev/null 2>&1; then
-            docker buildx create --name nexent_builder --use
-          else
-            docker buildx use nexent_builder
-          fi
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Clone model
@@ -68,4 +50,4 @@ jobs:
           rm -rf .git .gitattributes
       - name: Build data process image (arm64) and load locally
         run: |
-          docker buildx build --platform linux/arm64 -t nexent/nexent-data-process:dev-arm64 --load -f make/data_process/Dockerfile .
\ No newline at end of file
+          docker build --platform linux/arm64 -t nexent/nexent-data-process:dev-arm64 -f make/data_process/Dockerfile .
\ No newline at end of file
diff --git a/.github/workflows/auto-build-main-dev.yml b/.github/workflows/auto-build-main-dev.yml
new file mode 100644
index 000000000..dbd69ac12
--- /dev/null
+++ b/.github/workflows/auto-build-main-dev.yml
@@ -0,0 +1,41 @@
+name: Docker Build Main Images
+
+concurrency:
+  group: docker-build-main-dev-${{ github.ref }}
+  cancel-in-progress: true
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches: [develop]
+    paths:
+      - 'backend/**'
+      - 'sdk/**'
+      - 'make/main/**'
+      - '.github/workflows/**'
+  push:
+    branches: [develop]
+    paths:
+      - 'backend/**'
+      - 'sdk/**'
+      - 'make/main/**'
+      - '.github/workflows/**'
+
+jobs:
+  build-main-amd64:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Build main image (amd64) and load locally
+        run: |
+          docker build --platform linux/amd64 -t nexent/nexent:dev-amd64 -f make/main/Dockerfile .
+
+  build-main-arm64:
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Build main image (arm64) and load locally
+        run: |
+          docker build --platform linux/arm64 -t nexent/nexent:dev-arm64 -f make/main/Dockerfile .
\ No newline at end of file
diff --git a/.github/workflows/auto-build-terminal-dev.yml b/.github/workflows/auto-build-terminal-dev.yml
new file mode 100644
index 000000000..fbc251edb
--- /dev/null
+++ b/.github/workflows/auto-build-terminal-dev.yml
@@ -0,0 +1,37 @@
+name: Docker Build Terminal Images
+
+concurrency:
+  group: docker-build-terminal-dev-${{ github.ref }}
+  cancel-in-progress: true
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches: [develop]
+    paths:
+      - 'make/terminal/**'
+      - '.github/workflows/**'
+  push:
+    branches: [develop]
+    paths:
+      - 'make/terminal/**'
+      - '.github/workflows/**'
+
+jobs:
+  build-terminal-amd64:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Build terminal image (amd64) and load locally
+        run: |
+          docker build --platform linux/amd64 -t nexent/nexent-ubuntu-terminal:dev-amd64 -f make/terminal/Dockerfile .
+
+  build-terminal-arm64:
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Build terminal image (arm64) and load locally
+        run: |
+          docker build --platform linux/arm64 -t nexent/nexent-ubuntu-terminal:dev-arm64 -f make/terminal/Dockerfile .
\ No newline at end of file
diff --git a/.github/workflows/auto-build-web-dev.yml b/.github/workflows/auto-build-web-dev.yml
new file mode 100644
index 000000000..28f967894
--- /dev/null
+++ b/.github/workflows/auto-build-web-dev.yml
@@ -0,0 +1,39 @@
+name: Docker Build Web Images
+
+concurrency:
+  group: docker-build-web-dev-${{ github.ref }}
+  cancel-in-progress: true
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches: [develop]
+    paths:
+      - 'frontend/**'
+      - 'make/web/**'
+      - '.github/workflows/**'
+  push:
+    branches: [develop]
+    paths:
+      - 'frontend/**'
+      - 'make/web/**'
+      - '.github/workflows/**'
+
+jobs:
+  build-web-amd64:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Build web image (amd64) and load locally
+        run: |
+          docker build --platform linux/amd64 -t nexent/nexent-web:dev-amd64 -f make/web/Dockerfile .
+
+  build-web-arm64:
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Build web image (arm64) and load locally
+        run: |
+          docker build --platform linux/arm64 -t nexent/nexent-web:dev-arm64 -f make/web/Dockerfile .
\ No newline at end of file
diff --git a/.github/workflows/automic-image-pull-test.yml b/.github/workflows/auto-image-pull-test.yml
similarity index 100%
rename from .github/workflows/automic-image-pull-test.yml
rename to .github/workflows/auto-image-pull-test.yml
diff --git a/.github/workflows/automic-selenium-test.yml b/.github/workflows/auto-selenium-test.yml
similarity index 100%
rename from .github/workflows/automic-selenium-test.yml
rename to .github/workflows/auto-selenium-test.yml
diff --git a/.github/workflows/automic-unit-test.yml b/.github/workflows/auto-unit-test.yml
similarity index 100%
rename from .github/workflows/automic-unit-test.yml
rename to .github/workflows/auto-unit-test.yml
diff --git a/.github/workflows/automic-build-main-dev.yml b/.github/workflows/automic-build-main-dev.yml
deleted file mode 100644
index 4c717a4d6..000000000
--- a/.github/workflows/automic-build-main-dev.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-name: Docker Build Main Images
-
-concurrency:
-  group: docker-build-main-dev-${{ github.ref }}
-  cancel-in-progress: true
-
-on:
-  workflow_dispatch:
-  pull_request:
-    branches: [develop]
-    paths:
-      - 'backend/**'
-      - 'sdk/**'
-      - 'make/main/**'
-  push:
-    branches: [develop]
-    paths:
-      - 'backend/**'
-      - 'sdk/**'
-      - 'make/main/**'
-
-jobs:
-  build-main-amd64:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Docker Buildx
-        run: |
-          if ! docker buildx inspect nexent_builder > /dev/null 2>&1; then
-            docker buildx create --name nexent_builder --use
-          else
-            docker buildx use nexent_builder
-          fi
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Build main image (amd64) and load locally
-        run: |
-          docker buildx build --platform linux/amd64 -t nexent/nexent:dev-amd64 --load -f make/main/Dockerfile .
-
-  build-main-arm64:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Docker Buildx
-        run: |
-          if ! docker buildx inspect nexent_builder > /dev/null 2>&1; then
-            docker buildx create --name nexent_builder --use
-          else
-            docker buildx use nexent_builder
-          fi
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Build main image (arm64) and load locally
-        run: |
-          docker buildx build --platform linux/arm64 -t nexent/nexent:dev-arm64 --load -f make/main/Dockerfile .
\ No newline at end of file
diff --git a/.github/workflows/automic-build-terminal-dev.yml b/.github/workflows/automic-build-terminal-dev.yml
deleted file mode 100644
index 5d240f95b..000000000
--- a/.github/workflows/automic-build-terminal-dev.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-name: Docker Build Terminal Images
-
-concurrency:
-  group: docker-build-terminal-dev-${{ github.ref }}
-  cancel-in-progress: true
-
-on:
-  workflow_dispatch:
-  pull_request:
-    branches: [develop]
-    paths:
-      - 'make/terminal/**'
-  push:
-    branches: [develop]
-    paths:
-      - 'make/terminal/**'
-
-jobs:
-  build-terminal-amd64:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Docker Buildx
-        run: |
-          if ! docker buildx inspect nexent_builder > /dev/null 2>&1; then
-            docker buildx create --name nexent_builder --use
-          else
-            docker buildx use nexent_builder
-          fi
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Build terminal image (amd64) and load locally
-        run: |
-          docker buildx build --platform linux/amd64 -t nexent/nexent-ubuntu-terminal:dev-amd64 --load -f make/terminal/Dockerfile .
-
-  build-terminal-arm64:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Docker Buildx
-        run: |
-          if ! docker buildx inspect nexent_builder > /dev/null 2>&1; then
-            docker buildx create --name nexent_builder --use
-          else
-            docker buildx use nexent_builder
-          fi
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Build terminal image (arm64) and load locally
-        run: |
-          docker buildx build --platform linux/arm64 -t nexent/nexent-ubuntu-terminal:dev-arm64 --load -f make/terminal/Dockerfile .
\ No newline at end of file
diff --git a/.github/workflows/automic-build-web-dev.yml b/.github/workflows/automic-build-web-dev.yml
deleted file mode 100644
index 42865c6e8..000000000
--- a/.github/workflows/automic-build-web-dev.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-name: Docker Build Web Images
-
-concurrency:
-  group: docker-build-web-dev-${{ github.ref }}
-  cancel-in-progress: true
-
-on:
-  workflow_dispatch:
-  pull_request:
-    branches: [develop]
-    paths:
-      - 'frontend/**'
-      - 'make/web/**'
-  push:
-    branches: [develop]
-    paths:
-      - 'frontend/**'
-      - 'make/web/**'
-
-jobs:
-  build-web-amd64:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Docker Buildx
-        run: |
-          if ! docker buildx inspect nexent_builder > /dev/null 2>&1; then
-            docker buildx create --name nexent_builder --use
-          else
-            docker buildx use nexent_builder
-          fi
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Build web image (amd64) and load locally
-        run: |
-          docker buildx build --platform linux/amd64 -t nexent/nexent-web:dev-amd64 --load -f make/web/Dockerfile .
-
-  build-web-arm64:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Docker Buildx
-        run: |
-          if ! docker buildx inspect nexent_builder > /dev/null 2>&1; then
-            docker buildx create --name nexent_builder --use
-          else
-            docker buildx use nexent_builder
-          fi
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Build web image (arm64) and load locally
-        run: |
-          docker buildx build --platform linux/arm64 -t nexent/nexent-web:dev-arm64 --load -f make/web/Dockerfile .
\ No newline at end of file