diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
index d8bfc953df..6428c99839 100644
--- a/.github/workflows/build-images.yml
+++ b/.github/workflows/build-images.yml
@@ -34,9 +34,25 @@ jobs:
           path: changes
           name: changes
           if-no-files-found: ignore
+
+  sync-servers:
+    name: "Sync servers"
+    needs: [ fake]
+    if: ${{ github.repository_owner == 'Armbian' }}
+    uses: armbian/scripts/.github/workflows/sync-servers.yml@master
+
+    with:
+      KEY_ID: 'upload'
+
+    secrets:
+      KEY_UPLOAD: ${{ secrets.KEY_UPLOAD }}
+      USER_REPOSITORY: ${{ secrets.USER_REPOSITORY }}
+      HOST_REPOSITORY: ${{ secrets.HOST_REPOSITORY }}
+      KNOWN_HOSTS_REPOSITORY: ${{ secrets.KNOWN_HOSTS_REPOSITORY }}
+
       
   merge:
-    needs: [ fake ]
+    needs: [ sync-servers ]
     uses: armbian/scripts/.github/workflows/merge-from-branch.yml@master    
 
     with:
diff --git a/.github/workflows/build-train.yml b/.github/workflows/build-train.yml
index e635f7f346..7b157dbf31 100644
--- a/.github/workflows/build-train.yml
+++ b/.github/workflows/build-train.yml
@@ -229,6 +229,21 @@ jobs:
       HOST_REPOSITORY: ${{ secrets.HOST_REPOSITORY }}
       KNOWN_HOSTS_REPOSITORY: ${{ secrets.KNOWN_HOSTS_REPOSITORY }}
 
+  sync-servers:
+    name: "Sync servers"
+    needs: [apt-armbian-com,beta-armbian-com]
+    if: ${{ success() && github.repository_owner == 'Armbian' }}
+    uses: armbian/scripts/.github/workflows/sync-servers.yml@master
+
+    with:
+      KEY_ID: 'upload'
+
+    secrets:
+      KEY_UPLOAD: ${{ secrets.KEY_UPLOAD }}
+      USER_REPOSITORY: ${{ secrets.USER_REPOSITORY }}
+      HOST_REPOSITORY: ${{ secrets.HOST_REPOSITORY }}
+      KNOWN_HOSTS_REPOSITORY: ${{ secrets.KNOWN_HOSTS_REPOSITORY }}
+
   ##########################################################################################
   #                                                                                        #
   #                                    Build x86 CLI images                                #
@@ -236,7 +251,7 @@ jobs:
   ##########################################################################################
 
   x86-cli-images:
-    needs: [apt-armbian-com,beta-armbian-com]
+    needs: [apt-armbian-com,beta-armbian-com,sync-servers]
     uses: armbian/scripts/.github/workflows/build-with-docker.yml@master
 
     with:
@@ -266,7 +281,7 @@ jobs:
   ##########################################################################################
 
   x86-desktop-images:
-    needs: [apt-armbian-com,beta-armbian-com]
+    needs: [apt-armbian-com,beta-armbian-com,sync-servers]
     uses: armbian/scripts/.github/workflows/build-with-docker.yml@master
 
     with:
@@ -296,7 +311,7 @@ jobs:
   ##########################################################################################
 
   cli-images:
-    needs: [apt-armbian-com,beta-armbian-com]
+    needs: [apt-armbian-com,beta-armbian-com,sync-servers]
     uses: armbian/scripts/.github/workflows/build-with-docker.yml@master
 
     with:
@@ -326,7 +341,7 @@ jobs:
   ##########################################################################################
 
   desktop-images:
-    needs: [apt-armbian-com,beta-armbian-com]
+    needs: [apt-armbian-com,beta-armbian-com,sync-servers]
     uses: armbian/scripts/.github/workflows/build-with-docker.yml@master
 
     with: