diff --git a/gradle.properties b/gradle.properties
index 94e19280e..6b5ee937d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,7 +16,7 @@ mySqlDriverVersion=8.0.29
 mssqlDriverVersion=11.2.3.jre17
 postgresqlDriverVersion=42.6.0
 
-ballerinaLangVersion=2201.9.0-20240229-103900-a949e6d4
+ballerinaLangVersion=2201.9.0-20240319-094400-0453ecf0
 
 # Level 01
 stdlibIoVersion=1.6.0
diff --git a/persist-cli/src/main/java/io/ballerina/persist/cmd/PersistCodeGeneratorTool.java b/persist-cli/src/main/java/io/ballerina/persist/cmd/PersistCodeGeneratorTool.java
index 207be89d6..b0ed98217 100644
--- a/persist-cli/src/main/java/io/ballerina/persist/cmd/PersistCodeGeneratorTool.java
+++ b/persist-cli/src/main/java/io/ballerina/persist/cmd/PersistCodeGeneratorTool.java
@@ -26,6 +26,7 @@
 import io.ballerina.persist.nodegenerator.syntax.utils.TomlSyntaxUtils;
 import io.ballerina.persist.utils.BalProjectUtils;
 import io.ballerina.projects.buildtools.CodeGeneratorTool;
+import io.ballerina.projects.buildtools.ToolConfig;
 import io.ballerina.projects.buildtools.ToolContext;
 import io.ballerina.projects.util.ProjectUtils;
 
@@ -45,6 +46,7 @@
 import static io.ballerina.persist.PersistToolsConstants.TARGET_MODULE;
 import static io.ballerina.projects.util.ProjectConstants.BALLERINA_TOML;
 
+@ToolConfig(name = "persist")
 public class PersistCodeGeneratorTool implements CodeGeneratorTool {
 
     private static final PrintStream errStream = System.err;
@@ -155,11 +157,6 @@ public static String readFileToString(Path filePath) throws IOException {
         return new String(fileContent, StandardCharsets.UTF_8);
     }
 
-    @Override
-    public String toolName() {
-        return "persist";
-    }
-
     private void validateDatastore(String datastore) throws BalException {
         if (!PersistToolsConstants.SUPPORTED_DB_PROVIDERS.contains(datastore)) {
             throw new BalException(String.format("the persist layer supports one of data stores: %s" +