diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 0f4e5bf..58559fc 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -32,19 +32,20 @@ jobs:
       - name: Restore dependencies
         working-directory: .
         run: |
+          dotnet restore ${{ matrix.customer.plugin_project }}/${{ matrix.customer.plugin_project }}.csproj
           dotnet restore DiunaBI.API/DiunaBI.API.csproj
           dotnet restore DiunaBI.UI.Web/DiunaBI.UI.Web.csproj
-          dotnet restore ${{ matrix.customer.plugin_project }}/${{ matrix.customer.plugin_project }}.csproj
           dotnet restore DiunaBI.Tests/DiunaBI.Tests.csproj
 
       - name: Build solution and prepare plugins
         working-directory: .
         run: |
           set -e
-          # Build only required projects — skip DiunaBI.UI.Mobile
-          dotnet build DiunaBI.API/DiunaBI.API.csproj --configuration Release
-          dotnet build DiunaBI.UI.Web/DiunaBI.UI.Web.csproj --configuration Release
-          dotnet build ${{ matrix.customer.plugin_project }}/${{ matrix.customer.plugin_project }}.csproj --configuration Release
+          # Build plugin first to avoid missing dependency issues
+          dotnet build ${{ matrix.customer.plugin_project }}/${{ matrix.customer.plugin_project }}.csproj --configuration Release --no-restore
+          # Skip automatic plugin copy in API build since we only have one plugin restored
+          dotnet build DiunaBI.API/DiunaBI.API.csproj --configuration Release --no-restore -p:SkipPluginCopy=true
+          dotnet build DiunaBI.UI.Web/DiunaBI.UI.Web.csproj --configuration Release --no-restore
 
           mkdir -p DiunaBI.Tests/bin/Release/net10.0/Plugins
           cp ${{ matrix.customer.plugin_project }}/bin/Release/net10.0/${{ matrix.customer.plugin_project }}.dll DiunaBI.Tests/bin/Release/net10.0/Plugins/ || true
diff --git a/DiunaBI.API/DiunaBI.API.csproj b/DiunaBI.API/DiunaBI.API.csproj
index b5c21b0..e464ea4 100644
--- a/DiunaBI.API/DiunaBI.API.csproj
+++ b/DiunaBI.API/DiunaBI.API.csproj
@@ -37,7 +37,7 @@
     </Content>
   </ItemGroup>
 
-  <Target Name="CopyPlugins" AfterTargets="Build">
+  <Target Name="CopyPlugins" AfterTargets="Build" Condition="'$(SkipPluginCopy)' != 'true'">
     <MSBuild Projects="../DiunaBI.Plugins.Morska/DiunaBI.Plugins.Morska.csproj" Properties="Configuration=$(Configuration);TargetFramework=$(TargetFramework)" />
     <MSBuild Projects="../DiunaBI.Plugins.PedrolloPL/DiunaBI.Plugins.PedrolloPL.csproj" Properties="Configuration=$(Configuration);TargetFramework=$(TargetFramework)" />