diff --git a/.travis.yml b/.travis.yml
index a17b4ef..c56378a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,6 @@ env:
   matrix:
     - HUGO_VERSION=0.20.2
 
-    - PHP_VERSION=56 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb phpmyadmin postgres postgres-postgis pgadmin neo4j mongo redis"
-    - PHP_VERSION=70 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb phpmyadmin postgres postgres-postgis pgadmin neo4j mongo redis"
-    - PHP_VERSION=71 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb phpmyadmin postgres postgres-postgis pgadmin neo4j mongo redis"
-
     - PHP_VERSION=56 BUILD_SERVICE=workspace
     - PHP_VERSION=70 BUILD_SERVICE=workspace
     - PHP_VERSION=71 BUILD_SERVICE=workspace
@@ -19,11 +15,11 @@ env:
     - PHP_VERSION=70 BUILD_SERVICE=php-fpm
     - PHP_VERSION=71 BUILD_SERVICE=php-fpm
 
-    - PHP_VERSION=hhvm BUILD_SERVICE="hhvm"
+    - PHP_VERSION=hhvm BUILD_SERVICE=hhvm
 
-    # - PHP_VERSION=56 BUILD_SERVICE="php-worker"
-    - PHP_VERSION=70 BUILD_SERVICE="php-worker"
-    - PHP_VERSION=71 BUILD_SERVICE="php-worker"
+    # - PHP_VERSION=56 BUILD_SERVICE=php-worker
+    - PHP_VERSION=70 BUILD_SERVICE=php-worker
+    - PHP_VERSION=71 BUILD_SERVICE=php-worker
 
     - PHP_VERSION=56 BUILD_SERVICE=mssql
     - PHP_VERSION=70 BUILD_SERVICE=mssql
@@ -37,9 +33,11 @@ env:
     - PHP_VERSION=70 BUILD_SERVICE=aerospike
     - PHP_VERSION=71 BUILD_SERVICE=aerospike
 
-    - PHP_VERSION=56 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer"
-    - PHP_VERSION=70 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer"
-    - PHP_VERSION=71 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer"
+    - PHP_VERSION=NA BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb postgres postgres-postgis neo4j mongo redis"
+    - PHP_VERSION=NA BUILD_SERVICE="adminer phpmyadmin pgadmin"
+    - PHP_VERSION=NA BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer"
+    - PHP_VERSION=NA BUILD_SERVICE="kibana grafana laravel-echo-server"
+    # - PHP_VERSION=NA BUILD_SERVICE="aws"
 
 # Installing a newer Docker version
 before_install: