diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 79a7b02..86f5acb 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>io.github.llmagentbuilder</groupId>
       <artifactId>chat-agent-ui</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/bootstrap/src/main/kotlin/io/github/llmagentbuilder/bootstrap/AgentMain.kt b/bootstrap/src/main/kotlin/io/github/llmagentbuilder/bootstrap/AgentMain.kt
index eb3249a..8ce9cc7 100644
--- a/bootstrap/src/main/kotlin/io/github/llmagentbuilder/bootstrap/AgentMain.kt
+++ b/bootstrap/src/main/kotlin/io/github/llmagentbuilder/bootstrap/AgentMain.kt
@@ -1,11 +1,13 @@
 package io.github.llmagentbuilder.bootstrap
 
+import io.github.llmagentbuilder.core.VERSION
 import org.slf4j.LoggerFactory
 import java.nio.file.Path
 
 object AgentMain {
     fun start(configFile: String? = null) {
         val logger = LoggerFactory.getLogger(javaClass)
+        logger.info("Agent version: {}", VERSION)
         if (configFile != null) {
             logger.info("Bootstrap agent from config file $configFile")
             AgentBootstrap.bootstrap(Path.of(configFile))
diff --git a/cli/src/main/kotlin/io/github/llmagentbuilder/cli/CliApplication.kt b/cli/src/main/kotlin/io/github/llmagentbuilder/cli/CliApplication.kt
index 3520f07..2c5fe6d 100644
--- a/cli/src/main/kotlin/io/github/llmagentbuilder/cli/CliApplication.kt
+++ b/cli/src/main/kotlin/io/github/llmagentbuilder/cli/CliApplication.kt
@@ -2,13 +2,14 @@ package io.github.llmagentbuilder.cli
 
 import io.github.llmagentbuilder.cli.command.BuildCommand
 import io.github.llmagentbuilder.cli.command.RunCommand
+import io.github.llmagentbuilder.core.VERSION
 import picocli.CommandLine
 import kotlin.system.exitProcess
 
 @CommandLine.Command(
     name = "llm-agent-builder",
     mixinStandardHelpOptions = true,
-    version = ["0.3.3"],
+    version = [VERSION],
     description = ["Build LLM agents"],
     subcommands = [RunCommand::class, BuildCommand::class],
 )
diff --git a/cli/src/main/kotlin/io/github/llmagentbuilder/cli/MavenFilesGenerator.kt b/cli/src/main/kotlin/io/github/llmagentbuilder/cli/MavenFilesGenerator.kt
index 260b6e3..f186575 100644
--- a/cli/src/main/kotlin/io/github/llmagentbuilder/cli/MavenFilesGenerator.kt
+++ b/cli/src/main/kotlin/io/github/llmagentbuilder/cli/MavenFilesGenerator.kt
@@ -3,6 +3,7 @@ package io.github.llmagentbuilder.cli
 import com.github.jknack.handlebars.Handlebars
 import com.github.jknack.handlebars.io.ClassPathTemplateLoader
 import io.github.llmagentbuilder.core.AgentConfig
+import io.github.llmagentbuilder.core.VERSION
 import org.yaml.snakeyaml.LoaderOptions
 import org.yaml.snakeyaml.Yaml
 import org.yaml.snakeyaml.constructor.Constructor
@@ -27,7 +28,7 @@ object MavenFilesGenerator {
                 "springAiVersion" to (config.springAiVersion
                     ?: "1.0.0-SNAPSHOT"),
                 "llmAgentBuilderVersion" to (config.llmAgentBuilderVersion
-                    ?: "0.2.0"),
+                    ?: VERSION),
                 "dependencies" to collectDependencies(agentConfig),
 
                 )
@@ -67,10 +68,6 @@ object MavenFilesGenerator {
         return deps.toList()
     }
 
-    fun generateAssemblyDescriptor(): String {
-        val template = handlebars.compile("agent-jar-assembly.xml")
-        return template.apply(mapOf<String, Any?>())
-    }
 }
 
 fun main(args: Array<String>) {
diff --git a/cli/src/main/kotlin/io/github/llmagentbuilder/cli/command/BuildCommand.kt b/cli/src/main/kotlin/io/github/llmagentbuilder/cli/command/BuildCommand.kt
index 47269af..31b3c33 100644
--- a/cli/src/main/kotlin/io/github/llmagentbuilder/cli/command/BuildCommand.kt
+++ b/cli/src/main/kotlin/io/github/llmagentbuilder/cli/command/BuildCommand.kt
@@ -54,7 +54,7 @@ class BuildCommand : Callable<Int> {
             val outputPath = outputDir.resolve("agent.jar")
             Files.copy(
                 projectDir.resolve("target")
-                    .resolve("agent-jar-with-dependencies.jar"),
+                    .resolve("agent.jar"),
                 outputPath,
                 StandardCopyOption.REPLACE_EXISTING
             )
diff --git a/cli/src/main/kotlin/io/github/llmagentbuilder/cli/command/CommandHelper.kt b/cli/src/main/kotlin/io/github/llmagentbuilder/cli/command/CommandHelper.kt
index f092227..93a55fe 100644
--- a/cli/src/main/kotlin/io/github/llmagentbuilder/cli/command/CommandHelper.kt
+++ b/cli/src/main/kotlin/io/github/llmagentbuilder/cli/command/CommandHelper.kt
@@ -22,13 +22,6 @@ object CommandHelper {
             GenerationConfig(), config
         )
         writeFile(projectDir, "pom.xml", pom)
-        val assemblyDescriptor =
-            MavenFilesGenerator.generateAssemblyDescriptor()
-        writeFile(
-            projectDir.resolve("src").resolve("assembly"),
-            "agent-jar.xml",
-            assemblyDescriptor
-        )
         return projectDir
     }
 
diff --git a/cli/src/main/resources/template/agent-jar-assembly.xml.hbs b/cli/src/main/resources/template/agent-jar-assembly.xml.hbs
deleted file mode 100644
index 4d80363..0000000
--- a/cli/src/main/resources/template/agent-jar-assembly.xml.hbs
+++ /dev/null
@@ -1,22 +0,0 @@
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 https://maven.apache.org/xsd/assembly-2.2.0.xsd">
-  <id>jar-with-dependencies</id>
-  <formats>
-    <format>jar</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>/</outputDirectory>
-      <useProjectArtifact>true</useProjectArtifact>
-      <unpack>true</unpack>
-      <scope>runtime</scope>
-    </dependencySet>
-  </dependencySets>
-  <containerDescriptorHandlers>
-    <containerDescriptorHandler>
-      <handlerName>metaInf-services</handlerName>
-    </containerDescriptorHandler>
-  </containerDescriptorHandlers>
-</assembly>
\ No newline at end of file
diff --git a/cli/src/main/resources/template/pom.xml.hbs b/cli/src/main/resources/template/pom.xml.hbs
index 3cfe579..3ef0d9d 100644
--- a/cli/src/main/resources/template/pom.xml.hbs
+++ b/cli/src/main/resources/template/pom.xml.hbs
@@ -72,28 +72,19 @@
   </dependencies>
 
   <build>
+    <finalName>agent</finalName>
     <plugins>
       <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>3.7.1</version>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+        <version>3.3.4</version>
         <configuration>
-          <finalName>agent</finalName>
-          <descriptors>
-            <descriptor>src/assembly/agent-jar.xml</descriptor>
-          </descriptors>
-          <archive>
-            <manifest>
-              <mainClass>io.github.llmagentbuilder.bootstrap.AgentMainKt
-              </mainClass>
-            </manifest>
-          </archive>
+          <mainClass>io.github.llmagentbuilder.bootstrap.AgentMainKt</mainClass>
         </configuration>
         <executions>
           <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
             <goals>
-              <goal>single</goal>
+              <goal>repackage</goal>
             </goals>
           </execution>
         </executions>
diff --git a/core/pom.xml b/core/pom.xml
index dea91e0..693497a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -32,6 +32,37 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.gmaven</groupId>
+        <artifactId>groovy-maven-plugin</artifactId>
+        <version>2.1.1</version>
+        <executions>
+          <execution>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>execute</goal>
+            </goals>
+            <configuration>
+              <source>import java.nio.file.Files
+              import java.nio.file.Path
+
+              Files.writeString(Path.of(project.basedir.toPath().normalize().toAbsolutePath().toString(), "src", "main", "kotlin", "io", "github", "llmagentbuilder", "core", "Version.kt"), '''
+package io.github.llmagentbuilder.core
+
+const val VERSION = "${project.version}"
+''')
+              </source>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+            <version>2.4.21</version>
+          </dependency>
+        </dependencies>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/core/src/main/kotlin/io/github/llmagentbuilder/core/Version.kt b/core/src/main/kotlin/io/github/llmagentbuilder/core/Version.kt
new file mode 100644
index 0000000..7f91798
--- /dev/null
+++ b/core/src/main/kotlin/io/github/llmagentbuilder/core/Version.kt
@@ -0,0 +1,4 @@
+
+package io.github.llmagentbuilder.core
+
+const val VERSION = "0.3.3"