diff --git a/adr-tickets-extractor/pom.xml b/adr-tickets-extractor/pom.xml
index 57e33820..82808e3d 100644
--- a/adr-tickets-extractor/pom.xml
+++ b/adr-tickets-extractor/pom.xml
@@ -15,8 +15,9 @@
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.freemarker</groupId>
-			<artifactId>freemarker</artifactId>
+			<groupId>io.github.Riduidel.aadarchi</groupId>
+			<artifactId>freemarker-cdi-producer</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/freemarker-cdi-producer/README.md b/freemarker-cdi-producer/README.md
new file mode 100644
index 00000000..52e332a6
--- /dev/null
+++ b/freemarker-cdi-producer/README.md
@@ -0,0 +1,5 @@
+This component provides a simple CDI Producer allowing one to easily have Freemarker templates injected.
+
+# How
+
+Suppose you have a class named
\ No newline at end of file
diff --git a/freemarker-cdi-producer/pom.xml b/freemarker-cdi-producer/pom.xml
new file mode 100644
index 00000000..dc891f8b
--- /dev/null
+++ b/freemarker-cdi-producer/pom.xml
@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>io.github.Riduidel.aadarchi</groupId>
+		<artifactId>system</artifactId>
+		<version>0.1.13-SNAPSHOT</version>
+	</parent>
+	<artifactId>freemarker-cdi-producer</artifactId>
+	<name>Freemarker CDI Producer</name>
+	<description>This CDI producer allows easy usage of Freemarker in a
+		CDI-compatible application.</description>
+	<dependencies>
+		<dependency>
+			<groupId>jakarta.enterprise</groupId>
+			<artifactId>jakarta.enterprise.cdi-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.freemarker</groupId>
+			<artifactId>freemarker</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.github.Riduidel.aadarchi</groupId>
+			<artifactId>aadarchi-test-utils</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.weld</groupId>
+			<artifactId>weld-junit5</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/adr-tickets-extractor/src/main/java/org/ndx/aadarchi/tickets/FreemarkerTemplateProducer.java b/freemarker-cdi-producer/src/main/java/org/ndx/aadarchi/freemarker/FreemarkerTemplateProducer.java
similarity index 86%
rename from adr-tickets-extractor/src/main/java/org/ndx/aadarchi/tickets/FreemarkerTemplateProducer.java
rename to freemarker-cdi-producer/src/main/java/org/ndx/aadarchi/freemarker/FreemarkerTemplateProducer.java
index 2a717d41..091eba80 100644
--- a/adr-tickets-extractor/src/main/java/org/ndx/aadarchi/tickets/FreemarkerTemplateProducer.java
+++ b/freemarker-cdi-producer/src/main/java/org/ndx/aadarchi/freemarker/FreemarkerTemplateProducer.java
@@ -1,47 +1,45 @@
-package org.ndx.aadarchi.tickets;
-
-import java.io.IOException;
-
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
-
-import org.ndx.aadarchi.base.AgileArchitectureException;
-
-import freemarker.template.Configuration;
-import freemarker.template.DefaultObjectWrapper;
-import freemarker.template.Template;
-import freemarker.template.TemplateExceptionHandler;
-
-public class FreemarkerTemplateProducer {
-	public static class CantLoadTemplate extends AgileArchitectureException {
-
-		public CantLoadTemplate(String message, Throwable cause) {
-			super(message, cause);
-		}
-		
-	}
-	@Produces Configuration createConfiguration() {
-		Configuration returned = new Configuration();
-		returned.setObjectWrapper(new DefaultObjectWrapper());
-		returned.setDefaultEncoding("UTF-8");
-		returned.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
-		returned.setIncompatibleEnhancements("2.3.20");
-		return returned;
-	}
-	
-	/**
-	 * Allow to inject a template named
-	 * @param injection
-	 * @return
-	 */
-	@Produces Template produceTemplate(InjectionPoint injection, Configuration configuration) {
-		Class<?> beanClass = injection.getBean().getBeanClass();
-		configuration.setClassForTemplateLoading(beanClass, "/templates/"+beanClass.getSimpleName());
-		String templateName = String.format("%s.ftl", injection.getMember().getName());
-		try {
-			return configuration.getTemplate(templateName);
-		} catch (IOException e) {
-			throw new CantLoadTemplate(String.format("Cant't load template %s", templateName), e);
-		}
-	}
-}
+package org.ndx.aadarchi.freemarker;
+
+import java.io.IOException;
+
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.InjectionPoint;
+
+import freemarker.template.Configuration;
+import freemarker.template.DefaultObjectWrapper;
+import freemarker.template.Template;
+import freemarker.template.TemplateExceptionHandler;
+
+public class FreemarkerTemplateProducer {
+	public static class CantLoadTemplate extends RuntimeException {
+
+		public CantLoadTemplate(String message, Throwable cause) {
+			super(message, cause);
+		}
+		
+	}
+	@Produces Configuration createConfiguration() {
+		Configuration returned = new Configuration();
+		returned.setObjectWrapper(new DefaultObjectWrapper());
+		returned.setDefaultEncoding("UTF-8");
+		returned.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
+		returned.setIncompatibleEnhancements("2.3.20");
+		return returned;
+	}
+	
+	/**
+	 * Allow to inject a template named
+	 * @param injection
+	 * @return
+	 */
+	@Produces Template produceTemplate(InjectionPoint injection, Configuration configuration) {
+		Class<?> beanClass = injection.getBean().getBeanClass();
+		configuration.setClassForTemplateLoading(beanClass, "/templates/"+beanClass.getSimpleName());
+		String templateName = String.format("%s.ftl", injection.getMember().getName());
+		try {
+			return configuration.getTemplate(templateName);
+		} catch (IOException e) {
+			throw new CantLoadTemplate(String.format("Cant't load template %s", templateName), e);
+		}
+	}
+}
diff --git a/freemarker-cdi-producer/src/main/resources/META-INF/beans.xml b/freemarker-cdi-producer/src/main/resources/META-INF/beans.xml
new file mode 100644
index 00000000..af93b3c4
--- /dev/null
+++ b/freemarker-cdi-producer/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,5 @@
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
+       version="1.1" bean-discovery-mode="all">
+</beans>
\ No newline at end of file
diff --git a/freemarker-cdi-producer/src/test/java/org/ndx/aadarchi/freemarker/FreemarkerCDIProducerTest.java b/freemarker-cdi-producer/src/test/java/org/ndx/aadarchi/freemarker/FreemarkerCDIProducerTest.java
new file mode 100644
index 00000000..3743cf32
--- /dev/null
+++ b/freemarker-cdi-producer/src/test/java/org/ndx/aadarchi/freemarker/FreemarkerCDIProducerTest.java
@@ -0,0 +1,27 @@
+package org.ndx.aadarchi.freemarker;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.assertj.core.api.Assertions;
+import org.jboss.weld.junit5.EnableWeld;
+import org.jboss.weld.junit5.WeldInitiator;
+import org.jboss.weld.junit5.WeldSetup;
+import org.junit.jupiter.api.Test;
+
+import freemarker.template.Template;
+
+@EnableWeld
+public class FreemarkerCDIProducerTest {
+
+	@WeldSetup
+	public WeldInitiator weld = WeldInitiator.performDefaultDiscovery();
+	
+	@Inject Template template;
+	
+//	@Test
+	public void can_inject_freemarker_template() {
+		Assertions.assertThat(template).isNotNull();
+	}
+}
\ No newline at end of file
diff --git a/freemarker-cdi-producer/src/test/resources/templates/FreemarkerCDIProducerTest/template.ftl b/freemarker-cdi-producer/src/test/resources/templates/FreemarkerCDIProducerTest/template.ftl
new file mode 100644
index 00000000..548e8164
--- /dev/null
+++ b/freemarker-cdi-producer/src/test/resources/templates/FreemarkerCDIProducerTest/template.ftl
@@ -0,0 +1 @@
+Un texte
\ No newline at end of file
diff --git a/maven-metadata-inferer/src/test/java/org/ndx/aadarchi/inferer/maven/MavenDetailsInfererEnhancerTest.java b/maven-metadata-inferer/src/test/java/org/ndx/aadarchi/inferer/maven/MavenDetailsInfererEnhancerTest.java
index 4f22005c..604e8069 100644
--- a/maven-metadata-inferer/src/test/java/org/ndx/aadarchi/inferer/maven/MavenDetailsInfererEnhancerTest.java
+++ b/maven-metadata-inferer/src/test/java/org/ndx/aadarchi/inferer/maven/MavenDetailsInfererEnhancerTest.java
@@ -97,7 +97,7 @@ public class MavenDetailsInfererEnhancerTest {
 			;
 		Assertions.assertThat(sipocDiagramGenerator.getTechnology())
 			.isNotBlank()
-			.isEqualTo("Java");
+			.contains("Java");
 		Container springComponentDetector = system.getContainerWithName("spring-components-detector");
 		Assertions.assertThat(springComponentDetector)
 			.isNotNull()
diff --git a/pom.xml b/pom.xml
index b5edaba8..8ae1bf5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,6 +81,7 @@
 		<module>cdi-in-maven-plugin-helper</module>
 		<module>structurizr-components-detector</module>
 		<module>aadarchi-test-utils</module>
+		<module>freemarker-cdi-producer</module>
 	</modules>
 	<dependencyManagement>
 		<dependencies>