diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 54a63d604..37781487f 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -375,13 +375,10 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v3.1.0
 
-    # TODO: It'd be perfect if we could match final artifacts to the platform they target, so e.g. linux build comes from the linux machine
-    # However, that is currently impossible due to https://github.com/dotnet/msbuild/issues/3897
-    # Therefore, we'll (sadly) pull artifacts from Windows machine only for now
-    - name: Download ASF-generic artifact from windows-latest
+    - name: Download ASF-generic artifact from ubuntu-latest
       uses: actions/download-artifact@v3.0.1
       with:
-        name: windows-latest_ASF-generic
+        name: ubuntu-latest_ASF-generic
         path: out
 
     - name: Download ASF-generic-netf artifact from windows-latest
@@ -390,34 +387,34 @@ jobs:
         name: windows-latest_ASF-generic-netf
         path: out
 
-    - name: Download ASF-linux-arm artifact from windows-latest
+    - name: Download ASF-linux-arm artifact from ubuntu-latest
       uses: actions/download-artifact@v3.0.1
       with:
-        name: windows-latest_ASF-linux-arm
+        name: ubuntu-latest_ASF-linux-arm
         path: out
 
-    - name: Download ASF-linux-arm64 artifact from windows-latest
+    - name: Download ASF-linux-arm64 artifact from ubuntu-latest
       uses: actions/download-artifact@v3.0.1
       with:
-        name: windows-latest_ASF-linux-arm64
+        name: ubuntu-latest_ASF-linux-arm64
         path: out
 
-    - name: Download ASF-linux-x64 artifact from windows-latest
+    - name: Download ASF-linux-x64 artifact from ubuntu-latest
       uses: actions/download-artifact@v3.0.1
       with:
-        name: windows-latest_ASF-linux-x64
+        name: ubuntu-latest_ASF-linux-x64
         path: out
 
-    - name: Download ASF-osx-arm64 artifact from windows-latest
+    - name: Download ASF-osx-arm64 artifact from osx-latest
       uses: actions/download-artifact@v3.0.1
       with:
-        name: windows-latest_ASF-osx-arm64
+        name: osx-latest_ASF-osx-arm64
         path: out
 
-    - name: Download ASF-osx-x64 artifact from windows-latest
+    - name: Download ASF-osx-x64 artifact from osx-latest
       uses: actions/download-artifact@v3.0.1
       with:
-        name: windows-latest_ASF-osx-x64
+        name: osx-latest_ASF-osx-x64
         path: out
 
     - name: Download ASF-win-x64 artifact from windows-latest