diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8c0c113..e0bf6b0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -95,7 +95,7 @@ jobs:
     needs: [ sonar ]
     environment: 'Production'
     runs-on: ubuntu-latest
-    if: github.ref_name == 'dotnet8' && github.event_name == 'push'
+    if: github.ref_name == 'main' && github.event_name == 'push'
 
     steps:
       - uses: actions/checkout@v4
@@ -127,7 +127,7 @@ jobs:
     needs: [ sonar ]
     environment: 'Production Nuget'
     runs-on: ubuntu-latest
-    if: github.ref_name == 'dotnet8' && github.event_name == 'push'
+    if: github.ref_name == 'main' && github.event_name == 'push'
     
     steps:
       - uses: actions/checkout@v4
diff --git a/Directory.Build.props b/Directory.Build.props
index 5cdc48b..b3dfa48 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
     <PropertyGroup>
-        <Version>2.3.7</Version>
+        <Version>2.4.0</Version>
     </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/TakasakiStudio.Lina.AutoDependencyInjection/TakasakiStudio.Lina.AutoDependencyInjection.csproj b/TakasakiStudio.Lina.AutoDependencyInjection/TakasakiStudio.Lina.AutoDependencyInjection.csproj
index a42b47f..dbd7c3d 100644
--- a/TakasakiStudio.Lina.AutoDependencyInjection/TakasakiStudio.Lina.AutoDependencyInjection.csproj
+++ b/TakasakiStudio.Lina.AutoDependencyInjection/TakasakiStudio.Lina.AutoDependencyInjection.csproj
@@ -19,9 +19,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.3" />
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.3" />
-      <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.3" />
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />
+      <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.4" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/TakasakiStudio.Lina.Common/Extensions/RuleBuilderExtension.cs b/TakasakiStudio.Lina.Common/Extensions/RuleBuilderExtension.cs
index ca2ae0f..24f75b7 100644
--- a/TakasakiStudio.Lina.Common/Extensions/RuleBuilderExtension.cs
+++ b/TakasakiStudio.Lina.Common/Extensions/RuleBuilderExtension.cs
@@ -5,17 +5,20 @@ namespace TakasakiStudio.Lina.Common.Extensions;
 
 public static partial class RuleBuilderExtension
 {
-    public static IRuleBuilder<T, string> ValidCpf<T>(this IRuleBuilder<T, string> ruleBuilder)
+    public static IRuleBuilderOptions<T, string> IsCnpj<T>(
+        this IRuleBuilder<T, string> ruleBuilder)
     {
-        return ruleBuilder.Must(BeAValidCpf);
+        return ruleBuilder.Must(BeAValidCnpj);
     }
     
-    public static IRuleBuilder<T, string> ValidCnpj<T>(this IRuleBuilder<T, string> ruleBuilder)
+    
+    public static IRuleBuilderOptions<T, string> IsCpf<T>(
+        this IRuleBuilder<T, string> ruleBuilder)
     {
-        return ruleBuilder.Must(BeAValidCnpj);
+        return ruleBuilder.Must(BeAValidCpf);
     }
 
-    private static bool BeAValidCpf(string input)
+    public static bool BeAValidCpf(string input)
     {
         var numbers = ToNumbers(input);
         if (numbers.Length != 11 || numbers.Distinct().Count() == 1)
@@ -40,7 +43,7 @@ private static bool BeAValidCpf(string input)
         return numbers[9] == v1 && numbers[10] == v2;
     }
 
-    private static bool BeAValidCnpj(string input)
+    public static bool BeAValidCnpj(string input)
     {
         var numbers = ToNumbers(input);
         if (numbers.Length != 14)
diff --git a/TakasakiStudio.Lina.Database/TakasakiStudio.Lina.Database.csproj b/TakasakiStudio.Lina.Database/TakasakiStudio.Lina.Database.csproj
index 077bd34..acddc7b 100644
--- a/TakasakiStudio.Lina.Database/TakasakiStudio.Lina.Database.csproj
+++ b/TakasakiStudio.Lina.Database/TakasakiStudio.Lina.Database.csproj
@@ -19,8 +19,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.3" />
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.3" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.4" />
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/TakasakiStudio.Lina.Test/TakasakiStudio.Lina.Test.csproj b/TakasakiStudio.Lina.Test/TakasakiStudio.Lina.Test.csproj
index 1969525..6d27bd9 100644
--- a/TakasakiStudio.Lina.Test/TakasakiStudio.Lina.Test.csproj
+++ b/TakasakiStudio.Lina.Test/TakasakiStudio.Lina.Test.csproj
@@ -11,8 +11,8 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
-        <PackageReference Include="MSTest.TestAdapter" Version="3.8.2" />
-        <PackageReference Include="MSTest.TestFramework" Version="3.8.2" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.8.3" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.8.3" />
         <PackageReference Include="coverlet.collector" Version="6.0.4">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/TakasakiStudio.Lina.Utils/TakasakiStudio.Lina.Utils.csproj b/TakasakiStudio.Lina.Utils/TakasakiStudio.Lina.Utils.csproj
index e31dc8f..c942c2d 100644
--- a/TakasakiStudio.Lina.Utils/TakasakiStudio.Lina.Utils.csproj
+++ b/TakasakiStudio.Lina.Utils/TakasakiStudio.Lina.Utils.csproj
@@ -23,7 +23,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.3" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />
     </ItemGroup>
 
     <ItemGroup>