diff --git a/prowler/config/config.yaml b/prowler/config/config.yaml
index ef171ec75b..504899b1df 100644
--- a/prowler/config/config.yaml
+++ b/prowler/config/config.yaml
@@ -91,6 +91,7 @@ aws:
       "python3.6",
       "python2.7",
       "python3.7",
+      "python3.8",
       "nodejs4.3",
       "nodejs4.3-edge",
       "nodejs6.10",
@@ -101,6 +102,7 @@ aws:
       "nodejs14.x",
       "nodejs16.x",
       "dotnet5.0",
+      "dotnet6",
       "dotnet7",
       "dotnetcore1.0",
       "dotnetcore2.0",
diff --git a/prowler/providers/aws/services/awslambda/awslambda_function_using_supported_runtimes/awslambda_function_using_supported_runtimes.py b/prowler/providers/aws/services/awslambda/awslambda_function_using_supported_runtimes/awslambda_function_using_supported_runtimes.py
index dca9f6ff27..8472237316 100644
--- a/prowler/providers/aws/services/awslambda/awslambda_function_using_supported_runtimes/awslambda_function_using_supported_runtimes.py
+++ b/prowler/providers/aws/services/awslambda/awslambda_function_using_supported_runtimes/awslambda_function_using_supported_runtimes.py
@@ -1,6 +1,37 @@
 from prowler.lib.check.models import Check, Check_Report_AWS
 from prowler.providers.aws.services.awslambda.awslambda_client import awslambda_client
 
+<<<<<<< HEAD
+=======
+default_obsolete_lambda_runtimes = [
+    "java8",
+    "go1.x",
+    "provided",
+    "python3.6",
+    "python2.7",
+    "python3.7",
+    "python3.8",
+    "nodejs4.3",
+    "nodejs4.3-edge",
+    "nodejs6.10",
+    "nodejs",
+    "nodejs8.10",
+    "nodejs10.x",
+    "nodejs12.x",
+    "nodejs14.x",
+    "nodejs16.x",
+    "dotnet5.0",
+    "dotnet6",
+    "dotnet7",
+    "dotnetcore1.0",
+    "dotnetcore2.0",
+    "dotnetcore2.1",
+    "dotnetcore3.1",
+    "ruby2.5",
+    "ruby2.7",
+]
+
+>>>>>>> 9923def4c (chore(awslambda): update obsolete lambda runtimes (#7330))
 
 class awslambda_function_using_supported_runtimes(Check):
     def execute(self):