diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8bac89539..3b053b0a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -87,7 +87,8 @@ coverage:
   - postgres:latest
   - redis:latest
 
-package-passbook-server:
+build-passbook-server:
+  stage: build
   image:
     name: gcr.io/kaniko-project/executor:debug
     entrypoint: [""]
@@ -95,7 +96,6 @@ package-passbook-server:
     - echo "{\"auths\":{\"docker.beryju.org\":{\"auth\":\"$DOCKER_AUTH\"}}}" > /kaniko/.docker/config.json
   script:
     - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination docker.beryju.org/passbook/server:latest --destination docker.beryju.org/passbook/server:0.5.0-beta
-  stage: build
   only:
     - tags
     - /^version/.*$/
diff --git a/Dockerfile b/Dockerfile
index 309407f52..3e106277b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.beryju.org/passbook/base:test
+FROM docker.beryju.org/passbook/base:latest
 
 COPY ./passbook/ /app/passbook
 COPY ./manage.py /app/