diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1acac74..0957831 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,12 @@ cache:
     - .cache/pip
     - venv/
 
+stages:
+  - test
+  - build
+
 test:
+  stage: test
   script:
     - apt-get update && apt-get -y install python3-venv
     - python3 -V  # Print out python version for debugging
@@ -37,7 +42,8 @@ test:
     - PYTHONPATH=./tests/ pipenv run pytest -v ./tests
     - pipenv run halfapi --version
 
-run:
+build_pypi:
+  stage: build
   script:
     - apt-get update && apt-get -y install python3-venv
     - python3 -V  # Print out python version for debugging
@@ -49,7 +55,8 @@ run:
     paths:
       - dist/*.whl
 
-build:
+build_container:
+  stage: build
   image: $CI_REGISTRY/devtools/kaniko
   script:
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json