diff --git a/apidocs/docfx.json b/apidocs/docfx.json
index ce2eafad..7c1c0c1f 100644
--- a/apidocs/docfx.json
+++ b/apidocs/docfx.json
@@ -9,7 +9,7 @@
       ],
       "dest": "api",
       "properties": {
-        "TargetFramework": "net6.0"
+        "TargetFramework": "net8.0"
       },
       "disableGitFeatures": false,
       "disableDefaultFilter": false
diff --git a/docs/core/metrics-v2.md b/docs/core/metrics-v2.md
index 6598f672..c3d216c3 100644
--- a/docs/core/metrics-v2.md
+++ b/docs/core/metrics-v2.md
@@ -35,7 +35,7 @@ Powertools for AWS Lambda (.NET) are available as NuGet packages. You can instal
 
 * [AWS.Lambda.Powertools.Metrics](https://www.nuget.org/packages?q=AWS.Lambda.Powertools.Metrics):
 
-    `dotnet nuget add AWS.Lambda.Powertools.Metrics`
+    `dotnet add package AWS.Lambda.Powertools.Metrics`
 
 ## Terminologies
 
@@ -608,7 +608,7 @@ CloudWatch EMF uses the same dimensions across all your metrics. Use **`PushSing
       public async Task<APIGatewayProxyResponse> FunctionHandler(APIGatewayProxyRequest apigProxyEvent, ILambdaContext context)
       {
         Metrics.PushSingleMetric(
-                    metricName: "ColdStart",
+                    name: "ColdStart",
                     value: 1,
                     unit: MetricUnit.Count,
                     nameSpace: "ExampleApplication",
@@ -632,7 +632,7 @@ By default it will skip all previously defined dimensions including default dime
       public async Task<APIGatewayProxyResponse> FunctionHandler(APIGatewayProxyRequest apigProxyEvent, ILambdaContext context)
       {
         Metrics.PushSingleMetric(
-                    metricName: "ColdStart",
+                    name: "ColdStart",
                     value: 1,
                     unit: MetricUnit.Count,
                     nameSpace: "ExampleApplication",
diff --git a/docs/core/metrics.md b/docs/core/metrics.md
index 0a766414..03f7d6fa 100644
--- a/docs/core/metrics.md
+++ b/docs/core/metrics.md
@@ -28,7 +28,7 @@ Powertools for AWS Lambda (.NET) are available as NuGet packages. You can instal
 
 * [AWS.Lambda.Powertools.Metrics](https://www.nuget.org/packages?q=AWS.Lambda.Powertools.Metrics):
 
-    `dotnet nuget add AWS.Lambda.Powertools.Metrics`
+    `dotnet add package AWS.Lambda.Powertools.Metrics -v 1.7.1`
 
 ## Terminologies
 
diff --git a/libraries/src/AWS.Lambda.Powertools.Common/Core/PowertoolsConfigurations.cs b/libraries/src/AWS.Lambda.Powertools.Common/Core/PowertoolsConfigurations.cs
index bb12dbdc..3933972d 100644
--- a/libraries/src/AWS.Lambda.Powertools.Common/Core/PowertoolsConfigurations.cs
+++ b/libraries/src/AWS.Lambda.Powertools.Common/Core/PowertoolsConfigurations.cs
@@ -27,7 +27,7 @@ public class PowertoolsConfigurations : IPowertoolsConfigurations
     /// <summary>
     ///     The maximum dimensions
     /// </summary>
-    public const int MaxDimensions = 9;
+    public const int MaxDimensions = 29;
 
     /// <summary>
     ///     The maximum metrics
diff --git a/libraries/src/AWS.Lambda.Powertools.Metrics/Model/MetricDirective.cs b/libraries/src/AWS.Lambda.Powertools.Metrics/Model/MetricDirective.cs
index 111f417f..9047dca0 100644
--- a/libraries/src/AWS.Lambda.Powertools.Metrics/Model/MetricDirective.cs
+++ b/libraries/src/AWS.Lambda.Powertools.Metrics/Model/MetricDirective.cs
@@ -204,7 +204,7 @@ internal void AddDimension(DimensionSet dimension)
         else
         {
             throw new ArgumentOutOfRangeException(nameof(Dimensions),
-                "Cannot add more than 9 dimensions at the same time.");
+                $"Cannot add more than {PowertoolsConfigurations.MaxDimensions} dimensions at the same time.");
         }
     }
 
diff --git a/libraries/tests/AWS.Lambda.Powertools.Metrics.Tests/EMFValidationTests.cs b/libraries/tests/AWS.Lambda.Powertools.Metrics.Tests/EMFValidationTests.cs
index 04b86b3c..687ba17e 100644
--- a/libraries/tests/AWS.Lambda.Powertools.Metrics.Tests/EMFValidationTests.cs
+++ b/libraries/tests/AWS.Lambda.Powertools.Metrics.Tests/EMFValidationTests.cs
@@ -113,7 +113,7 @@ public void WhenMaxDataPointsAreAddedToTheSameMetric_FlushAutomatically()
         public void WhenMoreThan9DimensionsAdded_ThrowArgumentOutOfRangeException()
         {
             // Act
-            var act = () => { _handler.MaxDimensions(9); };
+            var act = () => { _handler.MaxDimensions(29); };
 
             // Assert
             Assert.Throws<ArgumentOutOfRangeException>(act);