diff --git a/README.md b/README.md
index 72453e4dc1..d4ff31e0ee 100644
--- a/README.md
+++ b/README.md
@@ -131,16 +131,6 @@ cd ..
 In Intellij IDEA, create a new project using the `work` directory as the source.
 * File > New Project from Existing Sources > .../work > Maven
 
-## Docker
-We generally use Docker for testing. In order to reduce the size of images we also supply a squash option that collapses
-the layers in the image. This is a long-standing experimental feature that we have fould useful. However you will need
-to enable experimental features in your Docker Engine. 
-~~~
-{
-  "experimental": true,
-  "debug": true
-}
-~~~
 ## Branches
 As multiple projects have been combined, branch names use the ACS version they are targeting.
 For example the code used to create the repository in ACS 6.2.1 is a branch called `releases/6.2.1`.
diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml
index d5692cbf35..429a43d7cf 100644
--- a/packaging/docker-alfresco/pom.xml
+++ b/packaging/docker-alfresco/pom.xml
@@ -134,17 +134,11 @@
                 <plugins>
                     <plugin>
                         <groupId>io.fabric8</groupId>
-                        <artifactId>fabric8-maven-plugin</artifactId>
+                        <artifactId>docker-maven-plugin</artifactId>
                         <configuration>
                             <images>
                                 <image>
                                     <name>${image.name}:${image.tag}</name>
-                                    <build>
-                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                        <buildOptions>
-                                            <squash>true</squash>
-                                        </buildOptions>
-                                    </build>
                                 </image>
                             </images>
                         </configuration>
@@ -169,29 +163,17 @@
                 <plugins>
                     <plugin>
                         <groupId>io.fabric8</groupId>
-                        <artifactId>fabric8-maven-plugin</artifactId>
+                        <artifactId>docker-maven-plugin</artifactId>
                         <configuration>
                             <images>
                                 <!-- Quay image -->
                                 <image>
                                     <name>${image.name}:${image.tag}</name>
                                     <registry>${image.registry}</registry>
-                                    <build>
-                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                        <buildOptions>
-                                            <squash>true</squash>
-                                        </buildOptions>
-                                    </build>
                                 </image>
                                 <!-- DockerHub image -->
                                 <image>
                                     <name>${image.name}:${image.tag}</name>
-                                    <build>
-                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                        <buildOptions>
-                                            <squash>true</squash>
-                                        </buildOptions>
-                                    </build>
                                 </image>
                             </images>
                         </configuration>
diff --git a/pom.xml b/pom.xml
index 1e63a5a4af..c4cb8943aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -653,8 +653,8 @@
                 </plugin>
                 <plugin>
                     <groupId>io.fabric8</groupId>
-                    <artifactId>fabric8-maven-plugin</artifactId>
-                    <version>4.4.0</version>
+                    <artifactId>docker-maven-plugin</artifactId>
+                    <version>0.34.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
diff --git a/scripts/travis/init.sh b/scripts/travis/init.sh
index b3da422021..2eb4e3f158 100644
--- a/scripts/travis/init.sh
+++ b/scripts/travis/init.sh
@@ -14,10 +14,6 @@ if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
   echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io
 fi
 
-# Enable experimental docker features (for the image squash option)
-echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json
-sudo service docker restart
-
 # not helpful in this script
 # export HOST_IP=$(hostname  -I | cut -f1 -d' ')