diff --git a/.gitea/workflows/build_dashboard.yaml b/.gitea/workflows/build_dashboard.yaml
index bbba54c..86e252c 100644
--- a/.gitea/workflows/build_dashboard.yaml
+++ b/.gitea/workflows/build_dashboard.yaml
@@ -10,10 +10,8 @@ jobs:
       run:
         working-directory: apps/dashboard-ui
     steps:
-      - name: Rewrite submodule URLs
-        run: |
-          git config --global url."http://172.20.8.90:3000/".insteadOf "https://git.datadunia.com/"
-          git config --global url."http://172.20.8.90:3000/".insteadOf "http://git.datadunia.com/"
+      - name: Configure git auth for submodules
+        run: git config --global url."https://x-access-token:${{ secrets.BUILD_TOKEN }}@git.datadunia.com/".insteadOf "https://git.datadunia.com/"
       - uses: actions/checkout@v4
         with:
           submodules: true
diff --git a/.gitea/workflows/build_device_agent.yaml b/.gitea/workflows/build_device_agent.yaml
index ddc433c..8e98c5f 100644
--- a/.gitea/workflows/build_device_agent.yaml
+++ b/.gitea/workflows/build_device_agent.yaml
@@ -17,10 +17,8 @@ jobs:
       run:
         working-directory: apps/device-agent
     steps:
-      - name: Rewrite submodule URLs
-        run: |
-          git config --global url."http://172.20.8.90:3000/".insteadOf "https://git.datadunia.com/"
-          git config --global url."http://172.20.8.90:3000/".insteadOf "http://git.datadunia.com/"
+      - name: Configure git auth for submodules
+        run: git config --global url."https://x-access-token:${{ secrets.BUILD_TOKEN }}@git.datadunia.com/".insteadOf "https://git.datadunia.com/"
       - uses: actions/checkout@v4
         with:
           submodules: true
diff --git a/.gitea/workflows/build_server_core.yaml b/.gitea/workflows/build_server_core.yaml
index f4b33b4..58aeb27 100644
--- a/.gitea/workflows/build_server_core.yaml
+++ b/.gitea/workflows/build_server_core.yaml
@@ -10,10 +10,8 @@ jobs:
       run:
         working-directory: apps/server-core
     steps:
-      - name: Rewrite submodule URLs
-        run: |
-          git config --global url."http://172.20.8.90:3000/".insteadOf "https://git.datadunia.com/"
-          git config --global url."http://172.20.8.90:3000/".insteadOf "http://git.datadunia.com/"
+      - name: Configure git auth for submodules
+        run: git config --global url."https://x-access-token:${{ secrets.BUILD_TOKEN }}@git.datadunia.com/".insteadOf "https://git.datadunia.com/"
       - uses: actions/checkout@v4
         with:
           submodules: true
diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index 09f4041..b75de4d 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -15,16 +15,12 @@ jobs:
       run:
         working-directory: apps/server-core
     steps:
-      - name: Rewrite submodule URLs
-        run: |
-          git config --global url."http://172.20.8.90:3000/".insteadOf "https://git.datadunia.com/"
-          git config --global url."http://172.20.8.90:3000/".insteadOf "http://git.datadunia.com/"
+      - name: Configure git auth for submodules
+        run: git config --global url."https://x-access-token:${{ secrets.BUILD_TOKEN }}@git.datadunia.com/".insteadOf "https://git.datadunia.com/"
       - uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 0
-          token: ${{ secrets.BUILD_TOKEN }}
-          persist-credentials: true
       - uses: actions/setup-go@v5
         with:
           go-version: '1.26'
@@ -37,16 +33,12 @@ jobs:
       run:
         working-directory: apps/device-agent
     steps:
-      - name: Rewrite submodule URLs
-        run: |
-          git config --global url."http://172.20.8.90:3000/".insteadOf "https://git.datadunia.com/"
-          git config --global url."http://172.20.8.90:3000/".insteadOf "http://git.datadunia.com/"
+      - name: Configure git auth for submodules
+        run: git config --global url."https://x-access-token:${{ secrets.BUILD_TOKEN }}@git.datadunia.com/".insteadOf "https://git.datadunia.com/"
       - uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 0
-          token: ${{ secrets.BUILD_TOKEN }}
-          persist-credentials: true
       - uses: actions/setup-go@v5
         with:
           go-version: '1.26'
@@ -59,16 +51,12 @@ jobs:
       run:
         working-directory: apps/dashboard-ui
     steps:
-      - name: Rewrite submodule URLs
-        run: |
-          git config --global url."http://172.20.8.90:3000/".insteadOf "https://git.datadunia.com/"
-          git config --global url."http://172.20.8.90:3000/".insteadOf "http://git.datadunia.com/"
+      - name: Configure git auth for submodules
+        run: git config --global url."https://x-access-token:${{ secrets.BUILD_TOKEN }}@git.datadunia.com/".insteadOf "https://git.datadunia.com/"
       - uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 0
-          token: ${{ secrets.BUILD_TOKEN }}
-          persist-credentials: true
       - uses: actions/setup-node@v4
         with:
           node-version: '24'
diff --git a/.gitea/workflows/docs_call.yaml b/.gitea/workflows/docs_call.yaml
index 4d4f225..8317f23 100644
--- a/.gitea/workflows/docs_call.yaml
+++ b/.gitea/workflows/docs_call.yaml
@@ -10,10 +10,8 @@ jobs:
       run:
         working-directory: apps/docs
     steps:
-      - name: Rewrite submodule URLs
-        run: |
-          git config --global url."http://172.20.8.90:3000/".insteadOf "https://git.datadunia.com/"
-          git config --global url."http://172.20.8.90:3000/".insteadOf "http://git.datadunia.com/"
+      - name: Configure git auth for submodules
+        run: git config --global url."https://x-access-token:${{ secrets.BUILD_TOKEN }}@git.datadunia.com/".insteadOf "https://git.datadunia.com/"
       - uses: actions/checkout@v4
         with:
           submodules: true
diff --git a/.gitea/workflows/release_call.yaml b/.gitea/workflows/release_call.yaml
index 77369ab..fd7bdd7 100644
--- a/.gitea/workflows/release_call.yaml
+++ b/.gitea/workflows/release_call.yaml
@@ -16,10 +16,8 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - name: Rewrite submodule URLs
-        run: |
-          git config --global url."http://172.20.8.90:3000/".insteadOf "https://git.datadunia.com/"
-          git config --global url."http://172.20.8.90:3000/".insteadOf "http://git.datadunia.com/"
+      - name: Configure git auth for submodules
+        run: git config --global url."https://x-access-token:${{ secrets.BUILD_TOKEN }}@git.datadunia.com/".insteadOf "https://git.datadunia.com/"
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0