diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 736c0b1..1a3d8f8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,8 +22,8 @@ jobs:
         id: version
         shell: bash
         run: |
-          echo "version=$(sed -n 's/.*<TargetRaylibTag>\(.*\)<\/TargetRaylibTag>.*/\1/p' Raylib-cs/Raylib-cs.csproj)">> ${GITHUB_OUTPUT}
-          echo "pkgversion=$(sed -n 's/.*<PackageVersion>\(.*\)<\/PackageVersion>.*/\1/p' Raylib-cs/Raylib-cs.csproj)">> ${GITHUB_OUTPUT}
+          echo "version=$(sed -n 's/.*<TargetRaylibTag>\(.*\)<\/TargetRaylibTag>.*/\1/p' Directory.Build.props)">> ${GITHUB_OUTPUT}
+          echo "pkgversion=$(sed -n 's/.*<PackageVersion>\(.*\)<\/PackageVersion>.*/\1/p' Directory.Build.props)">> ${GITHUB_OUTPUT}
 
   build-android:
     runs-on: ubuntu-latest
@@ -235,22 +235,22 @@ jobs:
           dotnet-version: 6.0.x
 
       - name: Create NuGet Package
-        run: dotnet pack -c Release Raylib-cs
+        run: dotnet pack -c Release -o artifacts/nupkg
 
       - name: Upload NuGet Package As Artifact
         uses: actions/upload-artifact@v3
         with:
-          path: Raylib-cs/bin/Release/Raylib-cs.${{ needs.prepare.outputs.pkgversion }}.*pkg
+          path: artifacts/nupkg/Raylib-cs.*.*pkg
 
       - name: Upload NuGet Package As Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
         with:
-          files: Raylib-cs/bin/Release/Raylib-cs.${{ needs.prepare.outputs.pkgversion }}.*pkg
+          files: artifacts/nupkg/Raylib-cs.*.*pkg
 
       - name: Publish to NuGet
         if: startsWith(github.ref, 'refs/tags/')
         run: |
           dotnet nuget push \
-            Raylib-cs/bin/Release/Raylib-cs.${{ needs.prepare.outputs.pkgversion }}.nupkg \
+            artifacts/nupkg/Raylib-cs.*.*pkg \
             --api-key ${{secrets.NUGET_API_KEY}}
diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000..e90982a
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,8 @@
+<Project>
+
+  <PropertyGroup>
+    <TargetRaylibTag>4.5.0</TargetRaylibTag>
+    <PackageVersion>4.5.0.2-android.1</PackageVersion>
+  </PropertyGroup>
+
+</Project>
\ No newline at end of file
diff --git a/Raylib-cs.Android.Sample/Raylib-cs.Android.Sample.csproj b/Raylib-cs.Android.Sample/Raylib-cs.Android.Sample.csproj
index 64842e7..46e6e3a 100644
--- a/Raylib-cs.Android.Sample/Raylib-cs.Android.Sample.csproj
+++ b/Raylib-cs.Android.Sample/Raylib-cs.Android.Sample.csproj
@@ -10,6 +10,7 @@
     <ApplicationVersion>1</ApplicationVersion>
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <EmbedAssembliesIntoApk Condition="$(Configuration) == 'Debug'">true</EmbedAssembliesIntoApk>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Raylib-cs" Version="4.5.0.2" />
diff --git a/Raylib-cs.Android/Raylib-cs.Android.csproj b/Raylib-cs.Android/Raylib-cs.Android.csproj
index 367d3ba..f4468fb 100644
--- a/Raylib-cs.Android/Raylib-cs.Android.csproj
+++ b/Raylib-cs.Android/Raylib-cs.Android.csproj
@@ -6,7 +6,6 @@
     <RootNamespace>Raylib_cs.Android</RootNamespace>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <AssemblyName>Raylibcs.Android</AssemblyName>
   </PropertyGroup>
 
 </Project>
\ No newline at end of file
diff --git a/Raylib-cs/Raylib-cs.csproj b/Raylib-cs/Raylib-cs.csproj
index 667b642..8c47f7c 100644
--- a/Raylib-cs/Raylib-cs.csproj
+++ b/Raylib-cs/Raylib-cs.csproj
@@ -11,9 +11,6 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetRaylibTag>4.5.0</TargetRaylibTag>
-    <Version>4.5.0.2</Version>
-    <PackageVersion>4.5.0.2</PackageVersion>
     <Authors>Chris Dill, Raysan5</Authors>
     <PackProject>true</PackProject>
     <IncludeSymbols>true</IncludeSymbols>