diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 55fc93c54..1071e16bc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -47,7 +47,7 @@ jobs:
           New-Item -ItemType Directory nuget_files > $null
           Copy-Item src\bin\Release\*.*nupkg nuget_files
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')
         with:
           name: nupkg
diff --git a/src/DotNet/Writer/ModuleWriter.cs b/src/DotNet/Writer/ModuleWriter.cs
index d4ade9ae9..e73005362 100644
--- a/src/DotNet/Writer/ModuleWriter.cs
+++ b/src/DotNet/Writer/ModuleWriter.cs
@@ -301,6 +301,10 @@ void InitializeChunkProperties() {
 		}
 
 		uint GetEntryPoint() {
+			var ep = Options.Cor20HeaderOptions.EntryPoint;
+			if (ep is not null)
+				return ep.Value;
+
 			if (module.ManagedEntryPoint is MethodDef methodEntryPoint)
 				return new MDToken(Table.Method, metadata.GetRid(methodEntryPoint)).Raw;