diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
index 706236640d84dfc30fa2ef3b22e2a04dc123f1d4..99396659f3dc69400e3b724f09559c008efbbdac 100644
--- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -6,11 +6,9 @@ default:
 
 stages:
   - prepare
-  - lint
-  # check if this needs to be a separate step
-  # - build_extensions
+  - linting
   - test
-  - package
+  - build
   - integration
   - publish # publish instead of deploy
 
@@ -120,7 +118,7 @@ build:
     - ninja
 
 pages:
-  stage: pages
+  stage: build
   needs: ["trigger_prepare"]
   script:
     # Generate documentation.
@@ -132,7 +130,7 @@ pages:
     # TODO: Add an index page with links to the documentation and coverage.
 
 abi-deploy:
-  stage: deploy
+  stage: publish
   needs: ["trigger_prepare"]
   environment: production
   script: