diff --git a/MODULE.bazel b/MODULE.bazel
index 940d4a87b4982..5c3919a6eac04 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -17,7 +17,7 @@ bazel_dep(name = "protobuf", version = "29.2", dev_dependency = True, repo_name
 # Required for rules_rust to import the crates properly
 bazel_dep(name = "rules_cc", version = "0.2.8", dev_dependency = True)
 
-bazel_dep(name = "rules_dotnet", version = "0.17.5")
+bazel_dep(name = "rules_dotnet", version = "0.20.5")
 bazel_dep(name = "rules_java", version = "8.7.1")
 bazel_dep(name = "rules_jvm_external", version = "6.8")
 bazel_dep(name = "rules_multitool", version = "1.3.0")
diff --git a/dotnet/src/webdriver/Firefox/FirefoxExtension.cs b/dotnet/src/webdriver/Firefox/FirefoxExtension.cs
index 8c23fcd07c6dd..11a97c8c01e83 100644
--- a/dotnet/src/webdriver/Firefox/FirefoxExtension.cs
+++ b/dotnet/src/webdriver/Firefox/FirefoxExtension.cs
@@ -22,6 +22,7 @@
 using System.Globalization;
 using System.IO;
 using System.IO.Compression;
+using System.Reflection;
 using System.Text.Json.Nodes;
 using System.Xml;
 
@@ -88,7 +89,7 @@ public void Install(string profileDirectory)
 
         // First, expand the .xpi archive into a temporary location.
         Directory.CreateDirectory(tempFileName);
-        Stream zipFileStream = ResourceUtilities.GetResourceStream(this.extensionFileName, this.extensionResourceId);
+        Stream zipFileStream = ResourceUtilities.GetResourceStream(this.extensionFileName, $"{Assembly.GetExecutingAssembly().GetName().Name}.{this.extensionResourceId}");
         using (ZipArchive extensionZipArchive = new ZipArchive(zipFileStream, ZipArchiveMode.Read))
         {
             extensionZipArchive.ExtractToDirectory(tempFileName);
diff --git a/dotnet/src/webdriver/Firefox/FirefoxProfile.cs b/dotnet/src/webdriver/Firefox/FirefoxProfile.cs
index ad25a78b0727a..0af71b5d9c014 100644
--- a/dotnet/src/webdriver/Firefox/FirefoxProfile.cs
+++ b/dotnet/src/webdriver/Firefox/FirefoxProfile.cs
@@ -23,6 +23,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.IO.Compression;
+using System.Reflection;
 using System.Text.Json;
 
 namespace OpenQA.Selenium.Firefox;
@@ -297,7 +298,7 @@ private void UpdateUserPreferences(string profileDirectory)
 
     private Preferences ReadDefaultPreferences()
     {
-        using (Stream defaultPrefsStream = ResourceUtilities.GetResourceStream("webdriver_prefs.json", "webdriver_prefs.json"))
+        using (Stream defaultPrefsStream = ResourceUtilities.GetResourceStream("webdriver_prefs.json", $"{Assembly.GetExecutingAssembly().GetName().Name}.webdriver_prefs.json"))
         {
             using JsonDocument defaultPreferences = JsonDocument.Parse(defaultPrefsStream);
 
diff --git a/dotnet/src/webdriver/JavaScriptEngine.cs b/dotnet/src/webdriver/JavaScriptEngine.cs
index 3465c46b98cbb..3ed08e9fa944c 100644
--- a/dotnet/src/webdriver/JavaScriptEngine.cs
+++ b/dotnet/src/webdriver/JavaScriptEngine.cs
@@ -25,6 +25,7 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text.Json;
 using System.Threading.Tasks;
 
@@ -411,7 +412,7 @@ private async Task EnableDomains()
     private static string GetMutationListenerScript()
     {
         string listenerScript = string.Empty;
-        using (Stream resourceStream = ResourceUtilities.GetResourceStream("mutation-listener.js", "mutation-listener.js"))
+        using (Stream resourceStream = ResourceUtilities.GetResourceStream("mutation-listener.js", $"{Assembly.GetExecutingAssembly().GetName().Name}.mutation-listener.js"))
         {
             using (StreamReader resourceReader = new StreamReader(resourceStream))
             {
diff --git a/dotnet/src/webdriver/RelativeBy.cs b/dotnet/src/webdriver/RelativeBy.cs
index 2823b1c6a7f71..dd6335d76b32c 100644
--- a/dotnet/src/webdriver/RelativeBy.cs
+++ b/dotnet/src/webdriver/RelativeBy.cs
@@ -23,6 +23,7 @@
 using System.Collections.ObjectModel;
 using System.Globalization;
 using System.IO;
+using System.Reflection;
 
 namespace OpenQA.Selenium;
 
@@ -38,7 +39,7 @@ public sealed class RelativeBy : By
     private static string GetWrappedAtom()
     {
         string atom;
-        using (Stream atomStream = ResourceUtilities.GetResourceStream("find-elements.js", "find-elements.js"))
+        using (Stream atomStream = ResourceUtilities.GetResourceStream("find-elements.js", $"{Assembly.GetExecutingAssembly().GetName().Name}.find-elements.js"))
         {
             using (StreamReader atomReader = new StreamReader(atomStream))
             {
diff --git a/dotnet/src/webdriver/Selenium.WebDriver.csproj b/dotnet/src/webdriver/Selenium.WebDriver.csproj
index 69b2b398e3532..6cee5f837ea24 100644
--- a/dotnet/src/webdriver/Selenium.WebDriver.csproj
+++ b/dotnet/src/webdriver/Selenium.WebDriver.csproj
@@ -85,23 +85,23 @@
     <ItemGroup>
       <EmbeddedResource Include="$(ProjectDir)..\..\..\third_party\js\selenium\webdriver.json">
         <Visible>False</Visible>
-        <LogicalName>webdriver_prefs.json</LogicalName>
+        <LogicalName>$(AssemblyName).webdriver_prefs.json</LogicalName>
       </EmbeddedResource>
       <EmbeddedResource Include="$(ProjectDir)..\..\..\bazel-bin\javascript\webdriver\atoms\get-attribute.js">
         <Visible>False</Visible>
-        <LogicalName>get-attribute.js</LogicalName>
+        <LogicalName>$(AssemblyName).get-attribute.js</LogicalName>
       </EmbeddedResource>
       <EmbeddedResource Include="$(ProjectDir)..\..\..\bazel-bin\javascript\atoms\fragments\is-displayed.js">
         <Visible>False</Visible>
-        <LogicalName>is-displayed.js</LogicalName>
+        <LogicalName>$(AssemblyName).is-displayed.js</LogicalName>
       </EmbeddedResource>
       <EmbeddedResource Include="$(ProjectDir)..\..\..\bazel-bin\javascript\atoms\fragments\find-elements.js">
         <Visible>False</Visible>
-        <LogicalName>find-elements.js</LogicalName>
+        <LogicalName>$(AssemblyName).find-elements.js</LogicalName>
       </EmbeddedResource>
       <EmbeddedResource Include="$(ProjectDir)..\..\..\javascript\cdp-support\mutation-listener.js">
         <Visible>False</Visible>
-        <LogicalName>mutation-listener.js</LogicalName>
+        <LogicalName>$(AssemblyName).mutation-listener.js</LogicalName>
       </EmbeddedResource>
     </ItemGroup>
   </Target>
diff --git a/dotnet/src/webdriver/WebElement.cs b/dotnet/src/webdriver/WebElement.cs
index 4dba6ae8837f4..8a5c66bdad286 100644
--- a/dotnet/src/webdriver/WebElement.cs
+++ b/dotnet/src/webdriver/WebElement.cs
@@ -27,6 +27,7 @@
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
+using System.Reflection;
 
 namespace OpenQA.Selenium;
 
@@ -709,7 +710,7 @@ protected virtual Response Execute(string commandToExecute, Dictionary<string,
     private static string GetAtom(string atomResourceName)
     {
         string atom;
-        using (Stream atomStream = ResourceUtilities.GetResourceStream(atomResourceName, atomResourceName))
+        using (Stream atomStream = ResourceUtilities.GetResourceStream(atomResourceName, $"{Assembly.GetExecutingAssembly().GetName().Name}.{atomResourceName}"))
         {
             using (StreamReader atomReader = new StreamReader(atomStream))
             {