diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7685c182f6..6f501b111a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,3 @@
-image: shinyay/docker-mvn-jdk8:3.5.0
-
 variables:
   MAVEN_CLI_OPTS: "-s .m2/settings.xml --batch-mode --errors --show-version"
   MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"
@@ -12,15 +10,21 @@ 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