diff --git a/distribution/generator/pom.xml b/distribution/generator/pom.xml
index 419885b..ca58072 100644
--- a/distribution/generator/pom.xml
+++ b/distribution/generator/pom.xml
@@ -292,6 +292,10 @@
 									<groupId>org.apache.felix</groupId>
 									<artifactId>org.apache.felix.shell.remote</artifactId>
 								</artifactItem>
+								<artifactItem>
+									<groupId>org.eclipse.sensinact.gateway.nthbnd</groupId>
+									<artifactId>attributes-filter</artifactId>
+								</artifactItem>
 							</artifactItems>
 							<outputDirectory>${project.build.directory}/dependencies/bundle/4</outputDirectory>
 						</configuration>
diff --git a/distribution/generator/profile/attributes-filter-profile/about.html b/distribution/generator/profile/attributesfilter/about.html
similarity index 100%
rename from distribution/generator/profile/attributes-filter-profile/about.html
rename to distribution/generator/profile/attributesfilter/about.html
diff --git a/distribution/generator/profile/attributes-filter-profile/pom.xml b/distribution/generator/profile/attributesfilter/pom.xml
similarity index 97%
rename from distribution/generator/profile/attributes-filter-profile/pom.xml
rename to distribution/generator/profile/attributesfilter/pom.xml
index 08ff75f..2223d00 100644
--- a/distribution/generator/profile/attributes-filter-profile/pom.xml
+++ b/distribution/generator/profile/attributesfilter/pom.xml
@@ -22,7 +22,7 @@
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>attributes-filter-profile</artifactId>
+	<artifactId>attributesfilter</artifactId>
 	<packaging>pom</packaging>
 
 	<name>sensiNact IoT Gateway - sensiNact Runtime (${project.artifactId} bridge dependencies)</name>
diff --git a/distribution/generator/profile/pom.xml b/distribution/generator/profile/pom.xml
index c1e0595..33ed4d3 100644
--- a/distribution/generator/profile/pom.xml
+++ b/distribution/generator/profile/pom.xml
@@ -102,6 +102,7 @@
 		<module>sensinact-datastore</module>
 		<module>ldapfilter</module>
 		<module>geojsonfilter</module>
+		<module>attributesfilter</module>
 		<module>http-client</module>
 		<module>oauth2-profile</module>
 		<module>ttn-profile</module>
diff --git a/distribution/template/conf/config.properties b/distribution/template/conf/config.properties
index 30e4a66..06e2cad 100644
--- a/distribution/template/conf/config.properties
+++ b/distribution/template/conf/config.properties
@@ -137,7 +137,8 @@
   file:bundle/3/sensinact-system-${project.version}.jar
 
 felix.auto.start.4= \
-  file:bundle/4/org.apache.felix.shell.remote-${org.apache.felix.shell.remote.version}.jar
+  file:bundle/4/org.apache.felix.shell.remote-${org.apache.felix.shell.remote.version}.jar \
+  file:bundle/4/attributes-filter-${project.version}.jar
     
 felix.log.level=3
 
diff --git a/pom.xml b/pom.xml
index 19edc5e..bd7cd6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1196,6 +1196,11 @@
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.sensinact.gateway.nthbnd</groupId>
+				<artifactId>attributes-filter</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.sensinact.gateway.nthbnd</groupId>
 				<artifactId>jsonpath-filter</artifactId>
 				<version>${project.version}</version>
 			</dependency>