diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ce3b9be8..e3b1182f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,15 +20,15 @@ jobs:
         dotnet-version: '6.0.x'
     - name: Build
       run: pwsh make.ps1
-    - name: Package
-      run: pwsh make.ps1 package
-    - uses: actions/upload-artifact@v2
-      with:
-        name: packages
-        path: Package/Release/Packages
     - name: Test (net48)
       run: ./make.ps1 -frameworks net48 test-all
       shell: pwsh
     - name: Test (net6.0)
       run: ./make.ps1 -frameworks net6.0 test-all
       shell: pwsh
+    - name: Package
+      run: pwsh make.ps1 package
+      if: ${{ contains(fromJSON('["refs/heads/pyrevit-main","refs/heads/pyrevit-5-main"]'), github.ref) }}
+    - name: Push
+      run: dotnet nuget push Package\Release\Packages\*.nupkg --skip-duplicate --source https://nuget.pkg.github.com/pyrevitlabs/index.json --api-key ${{ secrets.GITHUB_TOKEN }}
+      if: ${{ contains(fromJSON('["refs/heads/pyrevit-main","refs/heads/pyrevit-5-main"]'), github.ref) }}
diff --git a/Build.proj b/Build.proj
index 7c0c7d07..0f722282 100644
--- a/Build.proj
+++ b/Build.proj
@@ -20,7 +20,7 @@
     <PackageVersion Condition="'$(ReleaseLevel)' != 'final' or '$(ReleaseSerial)' != '0'">$(MajorVersion).$(MinorVersion).$(MicroVersion)-$(ReleaseLevel)$(ReleaseSerial)</PackageVersion>
 
     <StageDir>$(RootDir)\Package\$(Configuration)\Stage\DynamicLanguageRuntime.$(PackageVersion)</StageDir>
-    <PackageDir>$(RootDir)\Package\$(Configuration)\Packages\DynamicLanguageRuntime.$(PackageVersion)</PackageDir>
+    <PackageDir>$(RootDir)\Package\$(Configuration)\Packages</PackageDir>
   </PropertyGroup>
 
   <PropertyGroup>