diff --git a/distribution/es7/pom.xml b/distribution/es7/pom.xml
deleted file mode 100644
index ace62213b..000000000
--- a/distribution/es7/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>fr.pilato.elasticsearch.crawler</groupId>
-        <artifactId>fscrawler-distribution</artifactId>
-        <version>2.10-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>fscrawler-es7</artifactId>
-    <name>FSCrawler ZIP Distribution for Elasticsearch 7.x</name>
-
-    <properties>
-        <module.name>es7</module.name>
-
-        <!-- We use this tag to make easy using docker pull dadoonet/fscrawler:noocr -->
-        <docker.noocr.tags.0>noocr</docker.noocr.tags.0>
-
-        <!-- The ocr version will be the default one for anyone trying docker pull dadoonet/fscrawler:VERSION -->
-        <docker.ocr.tags.0>${project.version}</docker.ocr.tags.0>
-        <docker.ocr.tags.1>latest</docker.ocr.tags.1>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>fr.pilato.elasticsearch.crawler</groupId>
-            <artifactId>fscrawler-elasticsearch-client-v7</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>io.fabric8</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index e293cea66..943ef928d 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -11,11 +11,6 @@
 
     <artifactId>fscrawler-distribution</artifactId>
     <name>FSCrawler ZIP Distribution</name>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>es7</module>
-    </modules>
 
     <properties>
         <!-- Global configuration parameters for docker -->
@@ -30,11 +25,13 @@
         <!-- Docker Image Definitions -->
         <!-- standard install with no ocr -->
         <docker.noocr.alias>${project.artifactId}-noocr</docker.noocr.alias>
-        <docker.noocr.name>${docker.username}/fscrawler:${project.version}-noocr-${module.name}</docker.noocr.name>
+        <docker.noocr.name>${docker.username}/fscrawler:${project.version}-noocr</docker.noocr.name>
         <docker.noocr.cacheFrom>${docker.noocr.name}</docker.noocr.cacheFrom>
-        <docker.noocr.dockerFile>${project.basedir}/../src/main/docker/Dockerfile</docker.noocr.dockerFile>
-        <docker.noocr.assembly.descriptor>${project.basedir}/../src/main/assembly/assembly.xml</docker.noocr.assembly.descriptor>
+        <docker.noocr.dockerFile>${project.basedir}/src/main/docker/Dockerfile</docker.noocr.dockerFile>
+        <docker.noocr.assembly.descriptor>${project.basedir}/src/main/assembly/assembly.xml</docker.noocr.assembly.descriptor>
         <docker.noocr.assembly.mode>tgz</docker.noocr.assembly.mode>
+        <!-- We use this tag to make easy using docker pull dadoonet/fscrawler:noocr -->
+        <docker.noocr.tags.0>noocr</docker.noocr.tags.0>
 
         <!-- install tesseract-ocr and all language files -->
         <docker.ocr.alias>${project.artifactId}-ocr</docker.ocr.alias>
@@ -44,6 +41,9 @@
         <docker.ocr.assembly.descriptor>${docker.noocr.assembly.descriptor}</docker.ocr.assembly.descriptor>
         <docker.ocr.assembly.mode>${docker.noocr.assembly.mode}</docker.ocr.assembly.mode>
         <docker.ocr.args.langsPkg>imagemagick tesseract-ocr tesseract-ocr-all</docker.ocr.args.langsPkg>
+        <!-- The ocr version will be the default one for anyone trying docker pull dadoonet/fscrawler:VERSION -->
+        <docker.ocr.tags.0>${project.version}</docker.ocr.tags.0>
+        <docker.ocr.tags.1>latest</docker.ocr.tags.1>
 
         <distribution.mainClassName>fr.pilato.elasticsearch.crawler.fs.cli.FsCrawler</distribution.mainClassName>
     </properties>
@@ -53,6 +53,10 @@
             <groupId>fr.pilato.elasticsearch.crawler</groupId>
             <artifactId>fscrawler-cli</artifactId>
         </dependency>
+        <dependency>
+            <groupId>fr.pilato.elasticsearch.crawler</groupId>
+            <artifactId>fscrawler-elasticsearch-client</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -115,87 +119,84 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
             </plugin>
+
+            <!-- Generate the release zip file (run during package step) -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <descriptors>
+                        <descriptor>src/main/assembly/assembly.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>generate-release-plugin</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- Generate and push the docker images -->
+            <plugin>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <configuration>
+                    <authConfig>
+                        <push>
+                            <username>${docker.push.username}</username>
+                            <password>${docker.push.password}</password>
+                        </push>
+                    </authConfig>
+                    <!-- Create multiple images -->
+                    <images combine.self="override">
+                        <image>
+                            <external>
+                                <type>properties</type>
+                                <prefix>docker.noocr</prefix>
+                            </external>
+                        </image>
+                        <image>
+                            <external>
+                                <type>properties</type>
+                                <prefix>docker.ocr</prefix>
+                            </external>
+                        </image>
+                    </images>
+                </configuration>
+                <executions>
+                    <!-- Generate the docker images during the package phase -->
+                    <execution>
+                        <id>docker-build</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                    <!-- Push the docker images during the deploy phase -->
+                    <execution>
+                        <id>docker-push</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <!-- There is no integration test so we can skip that execution -->
+                        <id>start-elasticsearch</id>
+                        <phase>none</phase>
+                    </execution>
+                    <execution>
+                        <!-- There is no integration test so we can skip that execution -->
+                        <id>stop-elasticsearch</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
-        <pluginManagement>
-            <plugins>
-                <!-- Generate the release zip file (run during package step) -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <configuration>
-                        <appendAssemblyId>false</appendAssemblyId>
-                        <descriptors>
-                            <descriptor>${project.parent.basedir}/src/main/assembly/assembly.xml</descriptor>
-                        </descriptors>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <id>generate-release-plugin</id>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>single</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                <!-- Generate and push the docker images -->
-                <plugin>
-                    <groupId>io.fabric8</groupId>
-                    <artifactId>docker-maven-plugin</artifactId>
-                    <configuration>
-                        <authConfig>
-                            <push>
-                                <username>${docker.push.username}</username>
-                                <password>${docker.push.password}</password>
-                            </push>
-                        </authConfig>
-                        <!-- Create multiple images -->
-                        <images combine.self="override">
-                            <image>
-                                <external>
-                                    <type>properties</type>
-                                    <prefix>docker.noocr</prefix>
-                                </external>
-                            </image>
-                            <image>
-                                <external>
-                                    <type>properties</type>
-                                    <prefix>docker.ocr</prefix>
-                                </external>
-                            </image>
-                        </images>
-                    </configuration>
-                    <executions>
-                        <!-- Generate the docker images during the package phase -->
-                        <execution>
-                            <id>docker-build</id>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>build</goal>
-                            </goals>
-                        </execution>
-                        <!-- Push the docker images during the deploy phase -->
-                        <execution>
-                            <id>docker-push</id>
-                            <phase>deploy</phase>
-                            <goals>
-                                <goal>push</goal>
-                            </goals>
-                        </execution>
-                        <execution>
-                            <!-- There is no integration test so we can skip that execution -->
-                            <id>start-elasticsearch</id>
-                            <phase>none</phase>
-                        </execution>
-                        <execution>
-                            <!-- There is no integration test so we can skip that execution -->
-                            <id>stop-elasticsearch</id>
-                            <phase>none</phase>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
     </build>
 
 </project>
diff --git a/distribution/src/main/assembly/assembly.xml b/distribution/src/main/assembly/assembly.xml
index ce08d9c1a..ab9c11fde 100644
--- a/distribution/src/main/assembly/assembly.xml
+++ b/distribution/src/main/assembly/assembly.xml
@@ -13,7 +13,7 @@
 
     <fileSets>
         <fileSet>
-            <directory>${project.parent.basedir}/src/main/scripts</directory>
+            <directory>src/main/scripts</directory>
             <outputDirectory>bin</outputDirectory>
             <includes>
                 <include>fscrawler*</include>
@@ -21,7 +21,7 @@
             <filtered>true</filtered>
         </fileSet>
         <fileSet>
-            <directory>${project.parent.basedir}/..</directory>
+            <directory>../</directory>
             <outputDirectory/>
             <includes>
                 <include>LICENSE</include>
@@ -30,7 +30,7 @@
             </includes>
         </fileSet>
         <fileSet>
-            <directory>${project.parent.basedir}/../cli/src/main/resources</directory>
+            <directory>cli/src/main/resources</directory>
             <outputDirectory>config</outputDirectory>
             <includes>
                 <include>log4j2.xml</include>
diff --git a/distribution/es7/src/main/java/fr/pilato/elasticsearch/crawler/fs/cli/FsCrawler.java b/distribution/src/main/java/fr/pilato/elasticsearch/crawler/fs/cli/FsCrawler.java
similarity index 100%
rename from distribution/es7/src/main/java/fr/pilato/elasticsearch/crawler/fs/cli/FsCrawler.java
rename to distribution/src/main/java/fr/pilato/elasticsearch/crawler/fs/cli/FsCrawler.java
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index ba1391f8c..74ed9b3d7 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -64,6 +64,38 @@
         </testResources>
 
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <!-- We don't deploy our IT artifact to maven central -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <!-- We don't deploy our IT artifact to maven central -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <!-- We don't deploy our IT artifact to maven central -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+
             <!-- To start Docker Compose when running IT -->
             <plugin>
                 <groupId>com.dkanejs.maven.plugins</groupId>
@@ -107,6 +139,59 @@
     </build>
 
     <profiles>
+        <profile>
+            <id>skip-docker-compose</id>
+            <activation>
+                <property>
+                    <name>tests.cluster.url</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.dkanejs.maven.plugins</groupId>
+                        <artifactId>docker-compose-maven-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>de.scravy</groupId>
+                        <artifactId>waitfor-maven-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>run-docker-compose</id>
+            <activation>
+                <property>
+                    <name>!tests.cluster.url</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.dkanejs.maven.plugins</groupId>
+                        <artifactId>docker-compose-maven-plugin</artifactId>
+                        <configuration>
+                            <skip>${skipIntegTests}</skip>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>de.scravy</groupId>
+                        <artifactId>waitfor-maven-plugin</artifactId>
+                        <configuration>
+                            <skip>${skipIntegTests}</skip>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
         <!-- We are building a profile that can be activated from the IDE -->
         <profile>
             <id>es-7x</id>