diff --git a/.travis.yml b/.travis.yml
index b88312efff..4d6f6841ed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -96,19 +96,7 @@ jobs:
       before_script:
         - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH
         - bash scripts/waitForAlfrescoToStart.sh
-        - docker stats --no-stream
-        - docker update --memory=2Gb --memory-swap -1 rm-enterprise-repo_alfresco_1
-        - docker update --memory=1.5Gb --memory-swap -1 rm-enterprise-repo_search_1
-        - docker update --memory=1Gb --memory-swap -1 rm-enterprise-repo_zeppelin_1
-        - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_postgres_1
-        - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_transform-router_1
-        - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_imagemagick_1
-        - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_alfresco-pdf-renderer_1
-        - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_shared-file-store_1
-        - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_tika_1
-        - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_libreoffice_1
-        - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_activemq_1
-        - docker stats --no-stream
+        - bash scripts/dockerLimitMemory.sh
         - sudo free -m -t
       script:
         - travis_wait 30 mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -Dskip.automationtests=false
diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh
new file mode 100644
index 0000000000..b77c9c5764
--- /dev/null
+++ b/scripts/dockerLimitMemory.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+set -x
+
+# Display containers resources usage before limitation
+docker stats --no-stream
+
+#limit memory used by each container
+docker update --memory=2Gb --memory-swap -1 $(docker ps -a | grep '_alfresco_' | awk '{print $1}')
+docker update --memory=1.5Gb --memory-swap -1 $(docker ps -a | grep '_search_' | awk '{print $1}')
+docker update --memory=1Gb --memory-swap -1 $(docker ps -a | grep '_zeppelin_' | awk '{print $1}')
+docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_postgres_' | awk '{print $1}')
+docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_transform-router_' | awk '{print $1}')
+docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_imagemagick_' | awk '{print $1}')
+docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_alfresco-pdf-renderer_' | awk '{print $1}')
+docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_shared-file-store_' | awk '{print $1}')
+docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_tika_' | awk '{print $1}')
+docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_libreoffice_' | awk '{print $1}')
+docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_activemq_' | awk '{print $1}')
+
+# Display containers resources usage after limitation
+docker stats --no-stream