diff --git a/Activities/Credentials/UiPath.Credentials.Activities/UiPath.Credentials.Activities.csproj b/Activities/Credentials/UiPath.Credentials.Activities/UiPath.Credentials.Activities.csproj
index 083da668..b78fed49 100644
--- a/Activities/Credentials/UiPath.Credentials.Activities/UiPath.Credentials.Activities.csproj
+++ b/Activities/Credentials/UiPath.Credentials.Activities/UiPath.Credentials.Activities.csproj
@@ -42,6 +42,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Update="Properties\UiPath.Credentials.Activities.*.resx">
+      <DependentUpon>UiPath.Credentials.Activities.resx</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Update="Properties\UiPath.Credentials.Activities.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>UiPath.Credentials.Activities.Designer.cs</LastGenOutput>
diff --git a/Activities/Credentials/UiPath.Credentials.Packages/UiPath.Credentials.Packages.csproj b/Activities/Credentials/UiPath.Credentials.Packages/UiPath.Credentials.Packages.csproj
index 84ff0fe7..7141de4f 100644
--- a/Activities/Credentials/UiPath.Credentials.Packages/UiPath.Credentials.Packages.csproj
+++ b/Activities/Credentials/UiPath.Credentials.Packages/UiPath.Credentials.Packages.csproj
@@ -34,18 +34,10 @@
 	<Target Name="AddDlls">
 		<ItemGroup>
 			<BuildOutputInPackage Include="$(OutputPath)UiPath.Credentials.Activities.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)fr\UiPath.Credentials.Activities.resources.dll" TargetPath="fr\UiPath.Credentials.Activities.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)ja\UiPath.Credentials.Activities.resources.dll" TargetPath="ja\UiPath.Credentials.Activities.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)ru\UiPath.Credentials.Activities.resources.dll" TargetPath="ru\UiPath.Credentials.Activities.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)de\UiPath.Credentials.Activities.resources.dll" TargetPath="de\UiPath.Credentials.Activities.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)es\UiPath.Credentials.Activities.resources.dll" TargetPath="es\UiPath.Credentials.Activities.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)es-MX\UiPath.Credentials.Activities.resources.dll" TargetPath="es-MX\UiPath.Credentials.Activities.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)ko\UiPath.Credentials.Activities.resources.dll" TargetPath="ko\UiPath.Credentials.Activities.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)pt\UiPath.Credentials.Activities.resources.dll" TargetPath="pt\UiPath.Credentials.Activities.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)pt-BR\UiPath.Credentials.Activities.resources.dll" TargetPath="pt-BR\UiPath.Credentials.Activities.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)tr\UiPath.Credentials.Activities.resources.dll" TargetPath="tr\UiPath.Credentials.Activities.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)zh-CN\UiPath.Credentials.Activities.resources.dll" TargetPath="zh-CN\UiPath.Credentials.Activities.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)zh-TW\UiPath.Credentials.Activities.resources.dll" TargetPath="zh-TW\UiPath.Credentials.Activities.resources.dll" />
+			<CredentialsActivitiesResources Include="$(OutputPath)**\UiPath.Credentials.Activities.resources.dll" />
+			<BuildOutputInPackage Include="@(CredentialsActivitiesResources)">
+				<TargetPath>%(RecursiveDir)%(Filename)%(Extension)</TargetPath>
+			</BuildOutputInPackage>
 		</ItemGroup>
 		<ItemGroup>
 			<BuildOutputInPackage Include="$(OutputPath)UiPath.Credentials.Activities.ViewModels.dll" />
diff --git a/Activities/Cryptography/UiPath.Cryptography.Activities.Packaging/UiPath.Cryptography.Activities.Packaging.csproj b/Activities/Cryptography/UiPath.Cryptography.Activities.Packaging/UiPath.Cryptography.Activities.Packaging.csproj
index 12172203..9752af03 100644
--- a/Activities/Cryptography/UiPath.Cryptography.Activities.Packaging/UiPath.Cryptography.Activities.Packaging.csproj
+++ b/Activities/Cryptography/UiPath.Cryptography.Activities.Packaging/UiPath.Cryptography.Activities.Packaging.csproj
@@ -59,31 +59,15 @@
       <BuildOutputInPackage Include="$(OutputPath)UiPath.Cryptography.dll" />
       <BuildOutputInPackage Include="$(OutputPath)UiPath.Cryptography.Activities.dll" />
 
-      <BuildOutputInPackage Include="$(OutputPath)fr\UiPath.Cryptography.resources.dll" TargetPath="fr\UiPath.Cryptography.resources.dll" />
-      <BuildOutputInPackage Include="$(OutputPath)ja\UiPath.Cryptography.resources.dll" TargetPath="ja\UiPath.Cryptography.resources.dll" />
-      <BuildOutputInPackage Include="$(OutputPath)ru\UiPath.Cryptography.resources.dll" TargetPath="ru\UiPath.Cryptography.resources.dll" />
-      <BuildOutputInPackage Include="$(OutputPath)de\UiPath.Cryptography.resources.dll" TargetPath="de\UiPath.Cryptography.resources.dll" />
-      <BuildOutputInPackage Include="$(OutputPath)es\UiPath.Cryptography.resources.dll" TargetPath="es\UiPath.Cryptography.resources.dll" />
-      <BuildOutputInPackage Include="$(OutputPath)es-MX\UiPath.Cryptography.resources.dll" TargetPath="es-MX\UiPath.Cryptography.resources.dll" />
-      <BuildOutputInPackage Include="$(OutputPath)ko\UiPath.Cryptography.resources.dll" TargetPath="ko\UiPath.Cryptography.resources.dll" />
-      <BuildOutputInPackage Include="$(OutputPath)pt\UiPath.Cryptography.resources.dll" TargetPath="pt\UiPath.Cryptography.resources.dll" />
-      <BuildOutputInPackage Include="$(OutputPath)pt-BR\UiPath.Cryptography.resources.dll" TargetPath="pt-BR\UiPath.Cryptography.resources.dll" />
-      <BuildOutputInPackage Include="$(OutputPath)tr\UiPath.Cryptography.resources.dll" TargetPath="tr\UiPath.Cryptography.resources.dll" />
-      <BuildOutputInPackage Include="$(OutputPath)zh-CN\UiPath.Cryptography.resources.dll" TargetPath="zh-CN\UiPath.Cryptography.resources.dll" />
-	  <BuildOutputInPackage Include="$(OutputPath)zh-TW\UiPath.Cryptography.resources.dll" TargetPath="zh-TW\UiPath.Cryptography.resources.dll" />
+      <CryptographyResources Include="$(OutputPath)**\UiPath.Cryptography.resources.dll" />
+      <BuildOutputInPackage Include="@(CryptographyResources)">
+        <TargetPath>%(RecursiveDir)%(Filename)%(Extension)</TargetPath>
+      </BuildOutputInPackage>
 
-      <BuildOutputInPackage Include="$(OutputPath)fr\UiPath.Cryptography.Activities.resources.dll" TargetPath="fr\UiPath.Cryptography.Activities.resources.dll" />
-      <BuildOutputInPackage Include="$(OutputPath)ja\UiPath.Cryptography.Activities.resources.dll" TargetPath="ja\UiPath.Cryptography.Activities.resources.dll" />
-      <BuildOutputInPackage Include="$(OutputPath)ru\UiPath.Cryptography.Activities.resources.dll" TargetPath="ru\UiPath.Cryptography.Activities.resources.dll" />
-      <BuildOutputInPackage Include="$(OutputPath)de\UiPath.Cryptography.Activities.resources.dll" TargetPath="de\UiPath.Cryptography.Activities.resources.dll" />
-      <BuildOutputInPackage Include="$(OutputPath)es\UiPath.Cryptography.Activities.resources.dll" TargetPath="es\UiPath.Cryptography.Activities.resources.dll" />
-      <BuildOutputInPackage Include="$(OutputPath)es-MX\UiPath.Cryptography.Activities.resources.dll" TargetPath="es-MX\UiPath.Cryptography.Activities.resources.dll" />
-      <BuildOutputInPackage Include="$(OutputPath)ko\UiPath.Cryptography.Activities.resources.dll" TargetPath="ko\UiPath.Cryptography.Activities.resources.dll" />
-      <BuildOutputInPackage Include="$(OutputPath)pt\UiPath.Cryptography.Activities.resources.dll" TargetPath="pt\UiPath.Cryptography.Activities.resources.dll" />
-      <BuildOutputInPackage Include="$(OutputPath)pt-BR\UiPath.Cryptography.Activities.resources.dll" TargetPath="pt-BR\UiPath.Cryptography.Activities.resources.dll" />
-      <BuildOutputInPackage Include="$(OutputPath)tr\UiPath.Cryptography.Activities.resources.dll" TargetPath="tr\UiPath.Cryptography.Activities.resources.dll" />
-      <BuildOutputInPackage Include="$(OutputPath)zh-CN\UiPath.Cryptography.Activities.resources.dll" TargetPath="zh-CN\UiPath.Cryptography.Activities.resources.dll" />
-      <BuildOutputInPackage Include="$(OutputPath)zh-TW\UiPath.Cryptography.Activities.resources.dll" TargetPath="zh-TW\UiPath.Cryptography.Activities.resources.dll" />
+      <CryptographyActivitiesResources Include="$(OutputPath)**\UiPath.Cryptography.Activities.resources.dll" />
+      <BuildOutputInPackage Include="@(CryptographyActivitiesResources)">
+        <TargetPath>%(RecursiveDir)%(Filename)%(Extension)</TargetPath>
+      </BuildOutputInPackage>
     </ItemGroup>
   </Target>
 
diff --git a/Activities/Cryptography/UiPath.Cryptography.Activities/UiPath.Cryptography.Activities.csproj b/Activities/Cryptography/UiPath.Cryptography.Activities/UiPath.Cryptography.Activities.csproj
index 272ddfe3..b07534d5 100644
--- a/Activities/Cryptography/UiPath.Cryptography.Activities/UiPath.Cryptography.Activities.csproj
+++ b/Activities/Cryptography/UiPath.Cryptography.Activities/UiPath.Cryptography.Activities.csproj
@@ -32,13 +32,7 @@
  <EmbeddedResource Include="Resources\Icons\PGP_verify.svg" />
  </ItemGroup>
  <ItemGroup>
- <EmbeddedResource Update="Properties\UiPath.Cryptography.Activities.fr.resx">
- <DependentUpon>UiPath.Cryptography.Activities.resx</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Update="Properties\UiPath.Cryptography.Activities.ja.resx">
- <DependentUpon>UiPath.Cryptography.Activities.resx</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Update="Properties\UiPath.Cryptography.Activities.ru.resx">
+ <EmbeddedResource Update="Properties\UiPath.Cryptography.Activities.*.resx">
  <DependentUpon>UiPath.Cryptography.Activities.resx</DependentUpon>
  </EmbeddedResource>
  <EmbeddedResource Update="Properties\UiPath.Cryptography.Activities.resx">
diff --git a/Activities/Cryptography/UiPath.Cryptography/UiPath.Cryptography.csproj b/Activities/Cryptography/UiPath.Cryptography/UiPath.Cryptography.csproj
index 9025d063..4e27aa53 100644
--- a/Activities/Cryptography/UiPath.Cryptography/UiPath.Cryptography.csproj
+++ b/Activities/Cryptography/UiPath.Cryptography/UiPath.Cryptography.csproj
@@ -32,3 +32,33 @@
 		</EmbeddedResource>
 	</ItemGroup>
 </Project>
+ <Import Project="..\Cryptography.build.props" />
+ <PropertyGroup>
+ <TargetFrameworks>$(PortableFramework)</TargetFrameworks>
+ <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+ <OutputPath>..\..\Output\Activities\Cryptography\</OutputPath>
+ </PropertyGroup>
+ <Import Project="..\..\Shared\UiPath.Shared\UiPath.Shared.projitems" Label="Shared" />
+ <ItemGroup>
+ <PackageReference Include="UiPath.Workflow.Runtime" />
+ <PackageReference Include="UiPath.Workflow" />
+ <PackageReference Include="System.Security.Cryptography.Cng" />
+ <PackageReference Include="System.Formats.Asn1" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Update="Properties\UiPath.Cryptography.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>UiPath.Cryptography.resx</DependentUpon>
+ </Compile>
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Update="Properties\UiPath.Cryptography.*.resx">
+ <DependentUpon>UiPath.Cryptography.resx</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Update="Properties\UiPath.Cryptography.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>UiPath.Cryptography.Designer.cs</LastGenOutput>
+ </EmbeddedResource>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Activities/Database/ConnectionDialog/UiPath.Data.ConnectionUI.Dialog/UiPath.Data.ConnectionUI.Dialog.csproj b/Activities/Database/ConnectionDialog/UiPath.Data.ConnectionUI.Dialog/UiPath.Data.ConnectionUI.Dialog.csproj
index 4cce67d6..ce7cfd09 100644
--- a/Activities/Database/ConnectionDialog/UiPath.Data.ConnectionUI.Dialog/UiPath.Data.ConnectionUI.Dialog.csproj
+++ b/Activities/Database/ConnectionDialog/UiPath.Data.ConnectionUI.Dialog/UiPath.Data.ConnectionUI.Dialog.csproj
@@ -36,6 +36,9 @@
     </ItemGroup>
 
     <ItemGroup>
+        <EmbeddedResource Update="Properties\UiPath.Data.ConnectionUI.Dialog.*.resx">
+            <DependentUpon>UiPath.Data.ConnectionUI.Dialog.resx</DependentUpon>
+        </EmbeddedResource>
         <EmbeddedResource Update="Properties\UiPath.Data.ConnectionUI.Dialog.resx">
             <Generator>PublicResXFileCodeGenerator</Generator>
             <LastGenOutput>UiPath.Data.ConnectionUI.Dialog.Designer.cs</LastGenOutput>
diff --git a/Activities/Database/UiPath.Database.Activities.Design/UiPath.Database.Activities.Design.csproj b/Activities/Database/UiPath.Database.Activities.Design/UiPath.Database.Activities.Design.csproj
index e8c7c5d9..73ab4e18 100644
--- a/Activities/Database/UiPath.Database.Activities.Design/UiPath.Database.Activities.Design.csproj
+++ b/Activities/Database/UiPath.Database.Activities.Design/UiPath.Database.Activities.Design.csproj
@@ -25,13 +25,7 @@
     <PackageReference Include="UiPath.Activities.Api" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Update="Properties\UiPath.Database.Activities.Design.fr.resx">
-      <DependentUpon>UiPath.Database.Activities.Design.resx</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Properties\UiPath.Database.Activities.Design.ja.resx">
-      <DependentUpon>UiPath.Database.Activities.Design.resx</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Properties\UiPath.Database.Activities.Design.ru.resx">
+    <EmbeddedResource Update="Properties\UiPath.Database.Activities.Design.*.resx">
       <DependentUpon>UiPath.Database.Activities.Design.resx</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Update="Properties\UiPath.Database.Activities.Design.resx">
diff --git a/Activities/Database/UiPath.Database.Activities/UiPath.Database.Activities.csproj b/Activities/Database/UiPath.Database.Activities/UiPath.Database.Activities.csproj
index 06633e71..0696314f 100644
--- a/Activities/Database/UiPath.Database.Activities/UiPath.Database.Activities.csproj
+++ b/Activities/Database/UiPath.Database.Activities/UiPath.Database.Activities.csproj
@@ -41,19 +41,13 @@
         <ProjectReference Include="..\UiPath.Database\UiPath.Database.csproj" />
     </ItemGroup>
     <ItemGroup>
-        <EmbeddedResource Update="Properties\UiPath.Database.Activities.fr.resx">
-            <DependentUpon>UiPath.Database.Activities.resx</DependentUpon>
-        </EmbeddedResource>
-        <EmbeddedResource Update="Properties\UiPath.Database.Activities.ja.resx">
+        <EmbeddedResource Update="Properties\UiPath.Database.Activities.*.resx">
             <DependentUpon>UiPath.Database.Activities.resx</DependentUpon>
         </EmbeddedResource>
         <EmbeddedResource Update="Properties\UiPath.Database.Activities.resx">
             <Generator>PublicResXFileCodeGenerator</Generator>
             <LastGenOutput>UiPath.Database.Activities.Designer.cs</LastGenOutput>
         </EmbeddedResource>
-        <EmbeddedResource Update="Properties\UiPath.Database.Activities.ru.resx">
-            <DependentUpon>UiPath.Database.Activities.resx</DependentUpon>
-        </EmbeddedResource>
     </ItemGroup>
     <ItemGroup>
         <Compile Condition="'$(TargetFramework)' != '$(PortableFramework)'" Remove="NetCore/**" />
diff --git a/Activities/Database/UiPath.Database/UiPath.Database.csproj b/Activities/Database/UiPath.Database/UiPath.Database.csproj
index ed640d70..ffbb510f 100644
--- a/Activities/Database/UiPath.Database/UiPath.Database.csproj
+++ b/Activities/Database/UiPath.Database/UiPath.Database.csproj
@@ -39,18 +39,12 @@
         </Compile>
     </ItemGroup>
     <ItemGroup>
-        <EmbeddedResource Update="Properties\UiPath.Database.fr.resx">
-            <DependentUpon>UiPath.Database.resx</DependentUpon>
-        </EmbeddedResource>
-        <EmbeddedResource Update="Properties\UiPath.Database.ja.resx">
+        <EmbeddedResource Update="Properties\UiPath.Database.*.resx">
             <DependentUpon>UiPath.Database.resx</DependentUpon>
         </EmbeddedResource>
         <EmbeddedResource Update="Properties\UiPath.Database.resx">
             <Generator>PublicResXFileCodeGenerator</Generator>
             <LastGenOutput>UiPath.Database.Designer.cs</LastGenOutput>
         </EmbeddedResource>
-        <EmbeddedResource Update="Properties\UiPath.Database.ru.resx">
-            <DependentUpon>UiPath.Database.resx</DependentUpon>
-        </EmbeddedResource>
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Activities/FTP/UiPath.FTP.Activities.Design/UiPath.FTP.Activities.Design.csproj b/Activities/FTP/UiPath.FTP.Activities.Design/UiPath.FTP.Activities.Design.csproj
index f3088104..eb400d1c 100644
--- a/Activities/FTP/UiPath.FTP.Activities.Design/UiPath.FTP.Activities.Design.csproj
+++ b/Activities/FTP/UiPath.FTP.Activities.Design/UiPath.FTP.Activities.Design.csproj
@@ -41,6 +41,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Update="Properties\UiPath.FTP.Activities.Design.*.resx">
+      <DependentUpon>UiPath.FTP.Activities.Design.resx</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Update="Properties\UiPath.FTP.Activities.Design.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>UiPath.FTP.Activities.Design.Designer.cs</LastGenOutput>
diff --git a/Activities/FTP/UiPath.FTP.Activities/UiPath.FTP.Activities.csproj b/Activities/FTP/UiPath.FTP.Activities/UiPath.FTP.Activities.csproj
index 0afbb351..de8518c4 100644
--- a/Activities/FTP/UiPath.FTP.Activities/UiPath.FTP.Activities.csproj
+++ b/Activities/FTP/UiPath.FTP.Activities/UiPath.FTP.Activities.csproj
@@ -35,6 +35,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Update="Properties\UiPath.FTP.Activities.*.resx">
+      <DependentUpon>UiPath.FTP.Activities.resx</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Update="Properties\UiPath.FTP.Activities.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>UiPath.FTP.Activities.Designer.cs</LastGenOutput>
diff --git a/Activities/FTP/UiPath.FTP/UiPath.FTP.csproj b/Activities/FTP/UiPath.FTP/UiPath.FTP.csproj
index 08359f69..58805c05 100644
--- a/Activities/FTP/UiPath.FTP/UiPath.FTP.csproj
+++ b/Activities/FTP/UiPath.FTP/UiPath.FTP.csproj
@@ -15,4 +15,10 @@
     <PackageReference Include="SSH.NET" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\UiPath.FTP.*.resx">
+      <DependentUpon>UiPath.FTP.resx</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/Activities/Java/UiPath.Java.Activities.Design/UiPath.Java.Activities.Design.csproj b/Activities/Java/UiPath.Java.Activities.Design/UiPath.Java.Activities.Design.csproj
index cd4d92c9..f0670418 100644
--- a/Activities/Java/UiPath.Java.Activities.Design/UiPath.Java.Activities.Design.csproj
+++ b/Activities/Java/UiPath.Java.Activities.Design/UiPath.Java.Activities.Design.csproj
@@ -31,6 +31,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Update="Properties\UiPath.Java.Activities.Design.*.resx">
+      <DependentUpon>UiPath.Java.Activities.Design.resx</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Update="Properties\UiPath.Java.Activities.Design.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>UiPath.Java.Activities.Design.Designer.cs</LastGenOutput>
diff --git a/Activities/Java/UiPath.Java.Activities.Packaging/UiPath.Java.Activities.Packaging.csproj b/Activities/Java/UiPath.Java.Activities.Packaging/UiPath.Java.Activities.Packaging.csproj
index 08d59bb4..69e9a4e6 100644
--- a/Activities/Java/UiPath.Java.Activities.Packaging/UiPath.Java.Activities.Packaging.csproj
+++ b/Activities/Java/UiPath.Java.Activities.Packaging/UiPath.Java.Activities.Packaging.csproj
@@ -41,34 +41,18 @@
 			<BuildOutputInPackage Include="$(OutputPath)UiPath.Java.dll" />
 			<BuildOutputInPackage Include="$(OutputPath)UiPath.Java.Activities.dll" />
 
-			<BuildOutputInPackage Include="$(OutputPath)de\UiPath.Java.Activities.resources.dll" TargetPath="de\UiPath.Java.Activities.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)es\UiPath.Java.Activities.resources.dll" TargetPath="es\UiPath.Java.Activities.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)es-MX\UiPath.Java.Activities.resources.dll" TargetPath="es-MX\UiPath.Java.Activities.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)fr\UiPath.Java.Activities.resources.dll" TargetPath="fr\UiPath.Java.Activities.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)ja\UiPath.Java.Activities.resources.dll" TargetPath="ja\UiPath.Java.Activities.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)ko\UiPath.Java.Activities.resources.dll" TargetPath="ko\UiPath.Java.Activities.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)pt\UiPath.Java.Activities.resources.dll" TargetPath="pt\UiPath.Java.Activities.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)pt-BR\UiPath.Java.Activities.resources.dll" TargetPath="pt-BR\UiPath.Java.Activities.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)ru\UiPath.Java.Activities.resources.dll" TargetPath="ru\UiPath.Java.Activities.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)tr\UiPath.Java.Activities.resources.dll" TargetPath="tr\UiPath.Java.Activities.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)zh-CN\UiPath.Java.Activities.resources.dll" TargetPath="zh-CN\UiPath.Java.Activities.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)zh-TW\UiPath.Java.Activities.resources.dll" TargetPath="zh-TW\UiPath.Java.Activities.resources.dll" />
+			<JavaActivitiesResources Include="$(OutputPath)**\UiPath.Java.Activities.resources.dll" />
+			<BuildOutputInPackage Include="@(JavaActivitiesResources)">
+				<TargetPath>%(RecursiveDir)%(Filename)%(Extension)</TargetPath>
+			</BuildOutputInPackage>
 		</ItemGroup>
 		<ItemGroup Condition=" '$(TargetFramework)' != '$(PortableFramework)' ">
 			<BuildOutputInPackage Include="$(OutputPath)UiPath.Java.Activities.Design.dll" />
 
-			<BuildOutputInPackage Include="$(OutputPath)de\UiPath.Java.Activities.Design.resources.dll" TargetPath="de\UiPath.Java.Activities.Design.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)es\UiPath.Java.Activities.Design.resources.dll" TargetPath="es\UiPath.Java.Activities.Design.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)es-MX\UiPath.Java.Activities.Design.resources.dll" TargetPath="es-MX\UiPath.Java.Activities.Design.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)fr\UiPath.Java.Activities.Design.resources.dll" TargetPath="fr\UiPath.Java.Activities.Design.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)ja\UiPath.Java.Activities.Design.resources.dll" TargetPath="ja\UiPath.Java.Activities.Design.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)ko\UiPath.Java.Activities.Design.resources.dll" TargetPath="ko\UiPath.Java.Activities.Design.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)pt\UiPath.Java.Activities.Design.resources.dll" TargetPath="pt\UiPath.Java.Activities.Design.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)pt-BR\UiPath.Java.Activities.Design.resources.dll" TargetPath="pt-BR\UiPath.Java.Activities.Design.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)ru\UiPath.Java.Activities.Design.resources.dll" TargetPath="ru\UiPath.Java.Activities.Design.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)tr\UiPath.Java.Activities.Design.resources.dll" TargetPath="tr\UiPath.Java.Activities.Design.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)zh-CN\UiPath.Java.Activities.Design.resources.dll" TargetPath="zh-CN\UiPath.Java.Activities.Design.resources.dll" />
-			<BuildOutputInPackage Include="$(OutputPath)zh-TW\UiPath.Java.Activities.Design.resources.dll" TargetPath="zh-TW\UiPath.Java.Activities.Design.resources.dll" />
+			<JavaActivitiesDesignResources Include="$(OutputPath)**\UiPath.Java.Activities.Design.resources.dll" />
+			<BuildOutputInPackage Include="@(JavaActivitiesDesignResources)">
+				<TargetPath>%(RecursiveDir)%(Filename)%(Extension)</TargetPath>
+			</BuildOutputInPackage>
 		</ItemGroup>
 
 		<ItemGroup>
diff --git a/Activities/Java/UiPath.Java.Activities/UiPath.Java.Activities.csproj b/Activities/Java/UiPath.Java.Activities/UiPath.Java.Activities.csproj
index be35e110..7de67ed6 100644
--- a/Activities/Java/UiPath.Java.Activities/UiPath.Java.Activities.csproj
+++ b/Activities/Java/UiPath.Java.Activities/UiPath.Java.Activities.csproj
@@ -19,6 +19,11 @@
       <Name>UiPath.Java</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\UiPath.Java.Activities.*.resx">
+      <DependentUpon>UiPath.Java.Activities.resx</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="..\..\Shared\UiPath.Shared.Activities\UiPath.Shared.Activities.projitems" Label="Shared" />
   <Import Project="..\..\Shared\UiPath.Shared\UiPath.Shared.projitems" Label="Shared" />
   <Import Project="..\..\Shared\UiPath.Shared.Telemetry\UiPath.Shared.Telemetry.projitems" Label="Shared" />
diff --git a/Activities/Java/UiPath.Java/UiPath.Java.csproj b/Activities/Java/UiPath.Java/UiPath.Java.csproj
index 6ccb38f1..d5564e3b 100644
--- a/Activities/Java/UiPath.Java/UiPath.Java.csproj
+++ b/Activities/Java/UiPath.Java/UiPath.Java.csproj
@@ -7,4 +7,10 @@
   <ItemGroup Condition=" '$(TargetFramework)' == '$(PortableFramework)' ">
     <PackageReference Include="UiPath.Workflow" />
   </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\UiPath.Java.*.resx">
+      <DependentUpon>UiPath.Java.resx</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>
\ No newline at end of file