diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd7869a8f5727525364eb716d752bbce38e18703..890ee4f28ddec6726308785918b82dc1201dec37 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,8 +2,8 @@ variables:
   HEROKU_APP_NAME: tdt4242-base
   HEROKU_REGISTRY_IMAGE: registry.heroku.com/${HEROKU_APP_NAME}/web
 
+image: python:3
 test:
-  image: python:3
   script:
   # this configures Django application to use attached postgres database that is run on `postgres` host
     - cd backend/secfit
@@ -11,7 +11,6 @@ test:
     - pip install -r requirements.txt
     - python manage.py test
 
-image: docker:stable
 services:
   - docker:dind
 
@@ -19,6 +18,7 @@ stages:
   - build_and_deploy
 
 build_and_deploy:
+  image: docker:stable
   stage: build_and_deploy
   script:
     - apk add --no-cache curl