diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 051a55a09727d098ee7b98e468dc9e55c16d86ed..7f1a165a5c4c2c4889deb5b226cad2a524d80e6a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,9 @@
+stages:          # List of stages for jobs, and their order of execution
+  - build-env
+  - build-verapdf
+  - package-verapdf
+  - test-package
+
 variables:
   VERAPDF_VERSION: "1.24.1"
   DOCKERFILE_DEB: "${CI_PROJECT_DIR}/gitlab-ci/Dockerfile_DEB"
@@ -5,12 +11,6 @@ variables:
   IMAGE_TARGET_DEB: "${CI_REGISTRY_IMAGE}/debian12_verapdf_build_env"
   INSTALL_PATH_DEB: "/usr/local/verapdf"
 
-stages:          # List of stages for jobs, and their order of execution
-  - build-env
-  - local-install
-  - package
-  - install-test
-
 .build-env-job:
   stage: build-env
   timeout: 10m
@@ -48,7 +48,7 @@ build-debian-env-job:
     IMAGE_TARGET: ${IMAGE_TARGET_DEB}
 
 local-install-debian-job:   # This job runs in the test stage.
-  stage: local-install    # It only starts when the job in the build stage completes successfully.
+  stage: build-verapdf    # It only starts when the job in the build stage completes successfully.
   timeout: 5m
   tags:
     - "docker"
@@ -75,7 +75,7 @@ local-install-debian-job:   # This job runs in the test stage.
     - CALL_VERAPDF=$("${INSTALL_PATH_DEB}/verapdf" --version | grep "${VERAPDF_VERSION}")
 
 package-debian-job:
-  stage: package
+  stage: package-verapdf
   timeout: 5m
   image:
     name: "${IMAGE_TARGET_DEB}:latest"
@@ -108,7 +108,7 @@ package-debian-job:
       - "*.deb"
 
 test-install-debian-job:
-  stage: test-install
+  stage: test-package
   timeout: 5m
   image:
     # HINT: debian base image to simulate an installation target