diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a155ddd..3ebd256 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,30 +1,26 @@
 ---
-services:
-  - docker:dind
-
 stages:
   - check
   - build
-
-variables:
-  UNIQUE_IMAGE: registry.gitlab.com/$CI_PROJECT_NAMESPACE/${CI_PROJECT_NAME}:$CI_COMMIT_SHORT_SHA
-  REF_IMAGE: registry.gitlab.com/$CI_PROJECT_NAMESPACE/${CI_PROJECT_NAME}:$CI_COMMIT_REF_NAME
-
 check:
   image: python:3.11-bullseye
   stage: check
   script:
     - apt-get update
     - apt-get install -y make libolm-dev python3-poetry
-    - poetry config virtualenvs.create false
     - poetry install
     - make check
 
+
+variables:
+  UNIQUE_IMAGE: registry.gitlab.com/$CI_PROJECT_NAMESPACE/${CI_PROJECT_NAME}:$CI_COMMIT_SHORT_SHA
+  REF_IMAGE: registry.gitlab.com/$CI_PROJECT_NAMESPACE/${CI_PROJECT_NAME}:$CI_COMMIT_REF_NAME
+
 build-test:
-  image: docker:git
+  image: docker:latest
   stage: build
   script:
-    - echo $CI_BUILD_TOKEN | docker login -u gitlab-ci-token --password-stdin registry.gitlab.com
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
     # speed up build time by pulling the old image
     - docker pull registry.gitlab.com/$CI_PROJECT_NAMESPACE/${CI_PROJECT_NAME}:main
     - docker build -t $UNIQUE_IMAGE .
@@ -37,7 +33,7 @@ build:
   image: docker:git
   stage: build
   script:
-    - echo $CI_BUILD_TOKEN | docker login -u gitlab-ci-token --password-stdin registry.gitlab.com
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
     # speed up build time by pulling the old image
     - docker pull registry.gitlab.com/$CI_PROJECT_NAMESPACE/${CI_PROJECT_NAME}:main
     - docker build --no-cache -t $UNIQUE_IMAGE .