diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 82869f1..136c6fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,6 +15,7 @@ stages:
 - apk add --no-cache make
 
 test:dockerfile-lint:
+  stage: test
   image: hadolint/hadolint:v1.17.5-alpine
   script:
   - hadolint ./Dockerfile
@@ -28,11 +29,11 @@ test:dockerfile-lint:
     - master
 
 test:docker-image-build:
+  stage: test
   extends: .docker-build-setup
   script:
   - *install-make
   - make image
-  stage: test
   only:
     refs:
     - merge_requests
@@ -43,8 +44,8 @@ test:docker-image-build:
     - master
 
 test:custom-modules:
-  extends: .use-python
   stage: test
+  extends: .use-python
   before_script:
   - apt-get update && apt-get install make
   - pip install ansible==2.9.6
@@ -60,6 +61,7 @@ test:custom-modules:
     - master
 
 publish:docker-image:
+  stage: publish
   extends: .docker-build-setup
   before_script:
   - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}