diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 010f0e9c890ee0f9565d20ad9e75d990431b78c7..f7d9536da9f4f96b4117ef695f4400680d25eb47 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,6 @@ variables:
 
 stages:
   - test
-  - validate
   - integration-test
   - build
   - release
@@ -51,7 +50,7 @@ validate:
 
 integration-test-default:
   image: docker:dind
-  stage: test
+  stage: integration-test
   services:
     - name: docker:dind
       alias: docker
@@ -64,7 +63,7 @@ integration-test-default:
 
 integration-test-hopping:
   image: docker:dind
-  stage: test
+  stage: integration-test
   services:
     - name: docker:dind
       alias: docker
@@ -77,7 +76,7 @@ integration-test-hopping:
 
 integration-test-kcp:
   image: docker:dind
-  stage: test
+  stage: integration-test
   services:
     - name: docker:dind
       alias: docker
@@ -90,7 +89,7 @@ integration-test-kcp:
 
 integration-test-hopping-kcp:
   image: docker:dind
-  stage: test
+  stage: integration-test
   services:
     - name: docker:dind
       alias: docker
@@ -103,7 +102,7 @@ integration-test-hopping-kcp:
 
 integration-test-kcp-live-gw:
   image: docker:dind
-  stage: test
+  stage: integration-test
   services:
     - name: docker:dind
       alias: docker
@@ -125,7 +124,7 @@ integration-test-kcp-live-gw:
 
 integration-test-kcp-live-bridge:
   image: docker:dind
-  stage: test
+  stage: integration-test
   services:
     - name: docker:dind
       alias: docker
@@ -147,7 +146,7 @@ integration-test-kcp-live-bridge:
 
 integration-test-hopping-kcp-live-bridge:
   image: docker:dind
-  stage: test
+  stage: integration-test
   services:
     - name: docker:dind
       alias: docker
@@ -169,7 +168,7 @@ integration-test-hopping-kcp-live-bridge:
 
 integration-test-default-live-bridge:
   image: docker:dind
-  stage: test
+  stage: integration-test
   services:
     - name: docker:dind
       alias: docker