diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dcee208..b97be9e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: docker:19.03.12
+#image: docker:19.03.12
 
 # Change pip's cache directory to be inside the project directory since we can
 # only cache local items.
@@ -12,7 +12,13 @@ cache:
   paths:
   - .cache/pip
 
+stages:
+- test
+- build
+- push
+
 test:
+  image: python:3.8
   stage: test
   before_script:
   - apt-get update && apt-get install python3
@@ -22,12 +28,14 @@ test:
   script:
   - pytest
 
-docker build:
+build:
+  image: docker:19.03.12
   stage: build
   script:
   - docker build -t my_homepage .
 
 push:
+  image: docker:19.03.12
   stage: push
   script:
   - docker tag my_homepage $REPO/my_homepage:$TAG