diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
index 90e58e0c9..075c3d2bc 100644
--- a/.github/workflows/cd.yaml
+++ b/.github/workflows/cd.yaml
@@ -78,7 +78,7 @@ jobs:
       - name: Compile source
         if: env.AZURE_CREDENTIALS != ''
         run: npx tsc
-      - name: Deploy
+      - name: Deploy solution
         if: env.AZURE_CREDENTIALS != ''
         run: |
           az deployment group create \
@@ -91,6 +91,9 @@ jobs:
               appRegistrationClientId=$APP_REG_CLIENT_ID \
               b2cTenant=${B2C_TENANT} \
               unwiredlabsApiKey=${UNWIRED_LABS_API_KEY}
+      - name: Deploy ADU
+        if: env.AZURE_CREDENTIALS != ''
+        run: |
           # Incremental mode is used here to allow the creation of an ADU instance per solution independently
           az deployment group create \
             --resource-group ${ADU_RESOURCE_GROUP:-nRFAssetTrackerADU} \
diff --git a/.github/workflows/test-and-release.yaml b/.github/workflows/test-and-release.yaml
index f9e7c82f3..0eebeab38 100644
--- a/.github/workflows/test-and-release.yaml
+++ b/.github/workflows/test-and-release.yaml
@@ -82,6 +82,14 @@ jobs:
                 appRegistrationClientId=${APP_REG_CLIENT_ID} \
                 b2cTenant=${B2C_TENANT} \
                 b2cFlowName=B2C_1_developer
+      - name: Deploy ADU
+        if: env.AZURE_CREDENTIALS != ''
+        uses: nick-invision/retry@v2
+        with:
+          timeout_minutes: 10
+          retry_wait_seconds: 300
+          max_attempts: 3
+          command: |
             # Incremental mode is used here to allow the creation of an ADU instance per solution independently
             az deployment group create \
               --resource-group ${ADU_RESOURCE_GROUP:-nRFAssetTrackerADUCI} \