diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0df48d5c7ff78b80f9fbf63df809e36c552dfb56..fde5d59518ea63e63cba6cc6d8b324b051900b72 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,9 @@ image: golang:alpine
 
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
+  GOPATH: $CI_PROJECT_DIR/.go
+  GOCACHE: $CI_PROJECT_DIR/.cache
+
 
 stages:
   - build
@@ -14,21 +17,24 @@ go:
     - apk add build-base make git
     - cd plab
     - make
+  cache:
+    paths:
+      - .go
+      - .cache
   artifacts:
     paths:
       - plab/out/plab
 
 
 Build:
+  tags:
+    - podman-in-podman
   stage: docker
-  image:
-    name: gcr.io/kaniko-project/executor:debug
-    entrypoint: [ "" ]
+  image: quay.io/podman/stable
   script:
     - TAG=latest
     - "[[ ! \"${CI_COMMIT_REF_NAME:-master}\" = \"master\" ]] && TAG=\"$CI_COMMIT_REF_NAME\""
-    - mkdir -p /kaniko/.docker
-    - echo "{\"auths\":{\"https://index.docker.io/v1/\":{\"username\":\"$REGISTRY_USER\",\"password\":\"$REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-    - echo /kaniko/executor --force --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination "projlab/projlab:$TAG"
-    - /kaniko/executor --force --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination "projlab/projlab:$TAG"
+    - podman login --username $REGISTRY_USER --password $REGISTRY_PASSWORD docker.io
+    - podman build -t "projlab/projlab:$TAG" .
+    - podman push "projlab/projlab:$TAG"