diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5c5be7d5a9944cea5c0e81321b05246d7b3f407e..7245ca7bbc7a8ec2006763a934acc77241a76d27 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,28 +1,27 @@
-image: debian:bullseye
-
-# Is performed before the scripts in the stages step
-before_script:  
-  - source /etc/profile
-
-variables:
-  DEBEMAIL: "Daniel Kouril <kouril@ics.muni.cz>"
-
-# Defines stages which are to be executed
 stages:  
   - build
 
-# Stage "build"
-run-build:  
+.build:
+  tags:
+    - docker
   stage: build
   script:
-    - ./make.sh
-
-  # This stage is only executed if commited to master
-  only:
-    - master
-
-  # The files which are to be made available in GitLab
+    - make
   artifacts:
     paths:
-      - build/*
+      - creds2cc
+    name: creds2cc_$CUST_OS_NAME-$CUST_OS_VERSION
+    expire_in: 1 hour
+
+.build debian:
+  image: $CUST_OS_NAME:$CUST_OS_VERSION
+  before_script:
+    - apt update
+    - DEBIAN_FRONTEND=noninteractive apt install -y build-essential heimdal-dev
+  extends: .build unix
 
+.build debian 11:
+  variables:
+    CUST_OS_NAME: debian 
+    CUST_OS_VERSION: "11"
+  extends: .build debian