diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f501b111a..a86c573473 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,30 +1,27 @@
+image: charithag/docker-mvn-jdk8:latest
+
 variables:
-  MAVEN_CLI_OPTS: "-s .m2/settings.xml --batch-mode --errors --show-version"
+  MAVEN_CLI_OPTS: "-s .m2/settings.xml --batch-mode"
   MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"
 
 cache:
   paths:
     - .m2/repository/
+    - target/
 
 build:
   stage: build
   script:
     - mvn $MAVEN_CLI_OPTS clean install -Dmaven.test.skip=true
-  tags:
-    - OracleJDK1.8
 
 test:
   stage: test
   script:
     - mvn $MAVEN_CLI_OPTS test
-  tags:
-    - OracleJDK1.8
 
 deploy:
   stage: deploy
   script:
     - mvn $MAVEN_CLI_OPTS deploy -Dmaven.test.skip=true
-  tags:
-    - OracleJDK1.8
   only:
     - master
\ No newline at end of file