diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4df73f15..68d0dc36 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,10 +11,14 @@ build:
   stage: build
   script:
     - mvn $MAVEN_CLI_OPTS clean install
+  tags:
+    - OracleJDK1.8
 
 deploy:
   stage: deploy
   script:
-    - mvn $MAVEN_CLI_OPTS deploy -Dmaven.test.skip=true
+    - mvn $MAVEN_CLI_OPTS deploy
   only:
-    - master@entgra/product-iots
\ No newline at end of file
+    - master@entgra/product-iots
+  tags:
+    - OracleJDK1.8
\ No newline at end of file