diff --git a/ant/project.xml b/ant/project.xml
index 3cd8061d..a6b186bb 100644
--- a/ant/project.xml
+++ b/ant/project.xml
@@ -80,7 +80,7 @@
       <name>Arnaud Heritier</name>
       <id>aheritier</id>
       <email>aheritier@apache.org</email>
-      <organization/>
+      <organization>Octo Technology</organization>
       <roles>
         <role>Developer</role>
         <role>Release Manager</role>
diff --git a/checkstyle/project.xml b/checkstyle/project.xml
index 279f5e85..263ca5cd 100644
--- a/checkstyle/project.xml
+++ b/checkstyle/project.xml
@@ -112,7 +112,7 @@
       <name>Arnaud Heritier</name>
       <id>aheritier</id>
       <email>aheritier@apache.org</email>
-      <organization/>
+      <organization>Octo Technology</organization>
       <roles>
         <role>Developer</role>
       </roles>
diff --git a/genapp/project.xml b/genapp/project.xml
index 6a1ee106..c083134f 100644
--- a/genapp/project.xml
+++ b/genapp/project.xml
@@ -50,6 +50,7 @@
       <name>Arnaud Heritier</name>
       <id>aheritier</id>
       <email>aheritier@apache.org</email>
+      <organization>Octo Technology</organization>
       <roles>
         <role>Developer</role>
         <role>Release Manager</role>
diff --git a/javadoc/project.xml b/javadoc/project.xml
index 8f5736bd..78203508 100644
--- a/javadoc/project.xml
+++ b/javadoc/project.xml
@@ -111,6 +111,7 @@
       <name>Arnaud Heritier</name>
       <id>aheritier</id>
       <email>aheritier@apache.org</email>
+      <organization>Octo Technology</organization>
       <roles>
         <role>Developer</role>
         <role>Release Manager</role>
diff --git a/javadoc/src/plugin-test/project.xml b/javadoc/src/plugin-test/project.xml
index eade5af2..b12fa1ff 100644
--- a/javadoc/src/plugin-test/project.xml
+++ b/javadoc/src/plugin-test/project.xml
@@ -54,6 +54,7 @@
       <name>Arnaud Heritier</name>
       <id>aheritier</id>
       <email>aheritier@apache.org</email>
+      <organization>Octo Technology</organization>
       <roles>
         <role>Developer</role>
       </roles>
diff --git a/javadoc/src/plugin-test/test01/project.xml b/javadoc/src/plugin-test/test01/project.xml
index 11344eb1..4b3290bd 100644
--- a/javadoc/src/plugin-test/test01/project.xml
+++ b/javadoc/src/plugin-test/test01/project.xml
@@ -54,6 +54,7 @@
       <name>Arnaud Heritier</name>
       <id>aheritier</id>
       <email>aheritier@apache.org</email>
+      <organization>Octo Technology</organization>
       <roles>
         <role>Developer</role>
       </roles>
diff --git a/javadoc/src/plugin-test/test02/project.xml b/javadoc/src/plugin-test/test02/project.xml
index fa3d083f..e9d364e0 100644
--- a/javadoc/src/plugin-test/test02/project.xml
+++ b/javadoc/src/plugin-test/test02/project.xml
@@ -54,6 +54,7 @@
       <name>Arnaud Heritier</name>
       <id>aheritier</id>
       <email>aheritier@apache.org</email>
+      <organization>Octo Technology</organization>
       <roles>
         <role>Developer</role>
       </roles>
diff --git a/javadoc/src/plugin-test/test03/project.xml b/javadoc/src/plugin-test/test03/project.xml
index 8e4ff3d9..d4f2c186 100644
--- a/javadoc/src/plugin-test/test03/project.xml
+++ b/javadoc/src/plugin-test/test03/project.xml
@@ -54,6 +54,7 @@
       <name>Arnaud Heritier</name>
       <id>aheritier</id>
       <email>aheritier@apache.org</email>
+      <organization>Octo Technology</organization>
       <roles>
         <role>Developer</role>
       </roles>
diff --git a/javadoc/src/plugin-test/test04/project.xml b/javadoc/src/plugin-test/test04/project.xml
index ceec6de7..9b13e36c 100644
--- a/javadoc/src/plugin-test/test04/project.xml
+++ b/javadoc/src/plugin-test/test04/project.xml
@@ -54,6 +54,7 @@
       <name>Arnaud Heritier</name>
       <id>aheritier</id>
       <email>aheritier@apache.org</email>
+      <organization>Octo Technology</organization>
       <roles>
         <role>Developer</role>
       </roles>
diff --git a/javadoc/src/plugin-test/test05/project.xml b/javadoc/src/plugin-test/test05/project.xml
index 677453c6..ff065d3f 100644
--- a/javadoc/src/plugin-test/test05/project.xml
+++ b/javadoc/src/plugin-test/test05/project.xml
@@ -53,6 +53,7 @@
       <name>Arnaud Heritier</name>
       <id>aheritier</id>
       <email>aheritier@apache.org</email>
+      <organization>Octo Technology</organization>
       <roles>
         <role>Developer</role>
       </roles>
diff --git a/javadoc/src/plugin-test/test06/project.xml b/javadoc/src/plugin-test/test06/project.xml
index 0d73fed8..6979fdef 100644
--- a/javadoc/src/plugin-test/test06/project.xml
+++ b/javadoc/src/plugin-test/test06/project.xml
@@ -44,6 +44,7 @@
       <name>Arnaud Heritier</name>
       <id>aheritier</id>
       <email>aheritier@apache.org</email>
+      <organization>Octo Technology</organization>
       <roles>
         <role>Developer</role>
       </roles>
diff --git a/javadoc/src/plugin-test/test09/project.xml b/javadoc/src/plugin-test/test09/project.xml
index abbfe8d1..270f8e02 100644
--- a/javadoc/src/plugin-test/test09/project.xml
+++ b/javadoc/src/plugin-test/test09/project.xml
@@ -54,6 +54,7 @@
       <name>Arnaud Heritier</name>
       <id>aheritier</id>
       <email>aheritier@apache.org</email>
+      <organization>Octo Technology</organization>
       <roles>
         <role>Developer</role>
       </roles>
diff --git a/pdf/project.xml b/pdf/project.xml
index 6ab186b5..8b481dc3 100644
--- a/pdf/project.xml
+++ b/pdf/project.xml
@@ -63,6 +63,7 @@
       <name>Arnaud Heritier</name>
       <id>aheritier</id>
       <email>aheritier@apache.org</email>
+      <organization>Octo Technology</organization>
       <roles>
         <role>Developer</role>
         <role>Release Manager</role>
diff --git a/project.xml b/project.xml
index 772f763d..df9afef4 100644
--- a/project.xml
+++ b/project.xml
@@ -156,6 +156,7 @@
       <name>Arnaud Heritier</name>
       <id>aheritier</id>
       <email>aheritier@apache.org</email>
+      <organization>Octo Technology</organization>
       <roles>
         <role>Developer</role>
       </roles>
diff --git a/site/project.xml b/site/project.xml
index 52f06a42..6855b18a 100644
--- a/site/project.xml
+++ b/site/project.xml
@@ -74,7 +74,7 @@
       <name>Arnaud Heritier</name>
       <id>aheritier</id>
       <email>aheritier@apache.org</email>
-      <organization>ASF</organization>
+      <organization>Octo Technology</organization>
       <roles>
         <role>Developer</role>
       </roles>
diff --git a/tasklist/project.xml b/tasklist/project.xml
index 2276e3ac..4ab0c885 100644
--- a/tasklist/project.xml
+++ b/tasklist/project.xml
@@ -86,7 +86,7 @@
       <name>Arnaud Heritier</name>
       <id>aheritier</id>
       <email>aheritier@apache.org</email>
-      <organization/>
+      <organization>Octo Technology</organization>
       <roles>
         <role>Developer</role>
       </roles>
diff --git a/xdoc/project.xml b/xdoc/project.xml
index aa380aaf..46660bd2 100644
--- a/xdoc/project.xml
+++ b/xdoc/project.xml
@@ -134,7 +134,7 @@
       <name>Arnaud Heritier</name>
       <id>aheritier</id>
       <email>aheritier@apache.org</email>
-      <organization/>
+      <organization>Octo Technology</organization>
       <roles>
         <role>Release Manager</role>
         <role>Developer</role>