diff --git a/src/Dataverse/Solution/msbuild/build/TALXIS.DevKit.Build.Dataverse.Solution.props b/src/Dataverse/Solution/msbuild/build/TALXIS.DevKit.Build.Dataverse.Solution.props
index 4a623cf..beaf683 100644
--- a/src/Dataverse/Solution/msbuild/build/TALXIS.DevKit.Build.Dataverse.Solution.props
+++ b/src/Dataverse/Solution/msbuild/build/TALXIS.DevKit.Build.Dataverse.Solution.props
@@ -4,5 +4,7 @@
   <PropertyGroup>
     <ProjectType Condition="'$(ProjectType)'==''">Solution</ProjectType>
     <GeneratePluginAssembly Condition="'$(GeneratePluginAssembly)'==''">true</GeneratePluginAssembly>
+    <GenerateWebResources Condition="'$(GenerateWebResources)'==''">true</GenerateWebResources>
+    <ApplyPublisherPrefixToWebResource Condition="'$(ApplyPublisherPrefixToWebResource)'==''">true</ApplyPublisherPrefixToWebResource>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.ScriptLibraries.targets b/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.ScriptLibraries.targets
index ccd8b5c..f165184 100644
--- a/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.ScriptLibraries.targets
+++ b/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.ScriptLibraries.targets
@@ -110,7 +110,8 @@
     <MakeDir Directories="$(WebResourcesDir)" />
 
     <ResolveWebResourceName Files="@(_ScriptLibraryOutputs)"
-                            PublisherPrefix="$(PublisherPrefix)">
+                            PublisherPrefix="$(PublisherPrefix)"
+                            ApplyPrefix="$(ApplyPublisherPrefixToWebResource)">
       <Output TaskParameter="ResolvedFiles" ItemName="_ResolvedScriptFiles" />
     </ResolveWebResourceName>
 
@@ -123,7 +124,7 @@
       </_ScriptFilesToCopy>
     </ItemGroup>
 
-    <ItemGroup>
+    <ItemGroup Condition="'$(GenerateWebResources)'=='true'">
       <_ScriptFilesMissingDataXml Include="@(_ScriptFilesToCopy)"
                                   Condition="!Exists('%(DataXmlFile)')">
       </_ScriptFilesMissingDataXml>
@@ -131,18 +132,19 @@
 
     <Message Importance="high"
              Text="Generate webresource data.xml: @(_ScriptFilesMissingDataXml->'%(DataXmlFile)', ', ')"
-             Condition="'@(_ScriptFilesMissingDataXml)'!=''" />
+             Condition="'@(_ScriptFilesMissingDataXml)'!='' and '$(GenerateWebResources)'=='true'" />
 
     <EnsureWebResourceDataXml DataXmlFile="%(_ScriptFilesMissingDataXml.DataXmlFile)"
                               WebResourceName="%(_ScriptFilesMissingDataXml.WebResourceName)"
                               DisplayName="%(_ScriptFilesMissingDataXml.DisplayName)"
-                              Condition="'@(_ScriptFilesMissingDataXml)'!=''" />
+                              Condition="'@(_ScriptFilesMissingDataXml)'!='' and '$(GenerateWebResources)'=='true'" />
 
     <AddRootComponentToSolution
         SolutionPath="$(ProjectDir)$(SolutionRootPath)\Other\Solution.xml"
         Type="61"
         SchemaName="%(_ScriptFilesToCopy.WebResourceName)"
         Behavior="0"
+        Condition="'$(GenerateWebResources)'=='true'"
       />
   </Target>
 
diff --git a/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.props b/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.props
index f6dcf8a..77b3460 100644
--- a/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.props
+++ b/src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.props
@@ -3,5 +3,7 @@
   <PropertyGroup>
     <ProjectType Condition="'$(ProjectType)'==''">Solution</ProjectType>
     <GeneratePluginAssembly Condition="'$(GeneratePluginAssembly)'==''">true</GeneratePluginAssembly>
+    <GenerateWebResources Condition="'$(GenerateWebResources)'==''">true</GenerateWebResources>
+    <ApplyPublisherPrefixToWebResource Condition="'$(ApplyPublisherPrefixToWebResource)'==''">true</ApplyPublisherPrefixToWebResource>
   </PropertyGroup>
 </Project>
diff --git a/src/Dataverse/Tasks/Tasks/ResolveWebResourceName.cs b/src/Dataverse/Tasks/Tasks/ResolveWebResourceName.cs
index dfc1782..18e0488 100644
--- a/src/Dataverse/Tasks/Tasks/ResolveWebResourceName.cs
+++ b/src/Dataverse/Tasks/Tasks/ResolveWebResourceName.cs
@@ -11,6 +11,8 @@ public class ResolveWebResourceName : Task
     [Required]
     public string PublisherPrefix { get; set; } = "";
 
+    public bool ApplyPrefix { get; set; } = true;
+
     [Output]
     public ITaskItem[] ResolvedFiles { get; set; } = Array.Empty<ITaskItem>();
 
@@ -29,6 +31,19 @@ public override bool Execute()
                 string resolvedName;
                 string displayName;
 
+                if (!ApplyPrefix)
+                {
+                    resolvedName = fileName;
+                    displayName = fileName;
+
+                    var rawItem = new TaskItem(filePath);
+                    rawItem.SetMetadata("ResolvedName", resolvedName);
+                    rawItem.SetMetadata("DisplayName", displayName);
+                    results.Add(rawItem);
+
+                    continue;
+                }
+
                 int underscoreIndex = fileName.IndexOf('_');
 
                 if (underscoreIndex > 0)