diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d5a0b4d14ba186af306bd581ee88e111b15aea5..c27d8892ada0f0a59057d8aad25080b7ca9c7327 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,8 @@
 variables:
   DEBIAN_FRONTEND: noninteractive
-  LC_ALL: en_DK.UTF-8
+  LC_ALL: C
   GIT_STRATEGY: fetch
+  DOCKER_CMD: docker --config="$HOME/.docker/$CI_JOB_ID/"
 
 stages:
   - image
@@ -13,13 +14,13 @@ stages:
 docker:knot-dns:debian:
   stage: image
   allow_failure: true
-  before_script:
-    - docker info
   script:
-    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.labs.nic.cz
-    - docker build -t "knot-dns/debian:latest" "scripts/docker/debian:latest"
-    - docker tag "knot-dns/debian:latest" "registry.labs.nic.cz/knot/knot-dns/debian:latest"
-    - docker push "registry.labs.nic.cz/knot/knot-dns/debian:latest"
+    - $DOCKER_CMD login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.labs.nic.cz
+    - $DOCKER_CMD build -t "knot-dns/debian:latest" "scripts/docker/debian:latest"
+    - $DOCKER_CMD tag "knot-dns/debian:latest" "registry.labs.nic.cz/knot/knot-dns/debian:latest"
+    - $DOCKER_CMD push "registry.labs.nic.cz/knot/knot-dns/debian:latest"
+  after_script:
+    - rm -f "$HOME/.docker/$CI_JOB_ID/" # cleanup the credentials
   tags:
     - shell
     - linux
@@ -27,13 +28,13 @@ docker:knot-dns:debian:
 docker:knot-dns:ubuntu:
   stage: image
   allow_failure: true
-  before_script:
-    - docker info
   script:
-    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.labs.nic.cz
-    - docker build -t "knot-dns/ubuntu:latest" "scripts/docker/ubuntu:latest"
-    - docker tag "knot-dns/ubuntu:latest" "registry.labs.nic.cz/knot/knot-dns/ubuntu:latest"
-    - docker push "registry.labs.nic.cz/knot/knot-dns/ubuntu:latest"
+    - $DOCKER_CMD login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.labs.nic.cz
+    - $DOCKER_CMD build -t "knot-dns/ubuntu:latest" "scripts/docker/ubuntu:latest"
+    - $DOCKER_CMD tag "knot-dns/ubuntu:latest" "registry.labs.nic.cz/knot/knot-dns/ubuntu:latest"
+    - $DOCKER_CMD push "registry.labs.nic.cz/knot/knot-dns/ubuntu:latest"
+  after_script:
+    - rm -f "$HOME/.docker/$CI_JOB_ID/" # cleanup the credentials
   tags:
     - shell
     - linux
@@ -41,13 +42,13 @@ docker:knot-dns:ubuntu:
 docker:knot-dns:centos:
   stage: image
   allow_failure: true
-  before_script:
-    - docker info
   script:
-    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.labs.nic.cz
-    - docker build -t "knot-dns/centos:latest" "scripts/docker/centos:latest"
-    - docker tag "knot-dns/centos:latest" "registry.labs.nic.cz/knot/knot-dns/centos:latest"
-    - docker push "registry.labs.nic.cz/knot/knot-dns/centos:latest"
+    - $DOCKER_CMD login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.labs.nic.cz
+    - $DOCKER_CMD build -t "knot-dns/centos:latest" "scripts/docker/centos:latest"
+    - $DOCKER_CMD tag "knot-dns/centos:latest" "registry.labs.nic.cz/knot/knot-dns/centos:latest"
+    - $DOCKER_CMD push "registry.labs.nic.cz/knot/knot-dns/centos:latest"
+  after_script:
+    - rm -f "$HOME/.docker/$CI_JOB_ID/" # cleanup the credentials
   tags:
     - shell
     - linux
@@ -55,13 +56,13 @@ docker:knot-dns:centos:
 docker:knot-dns:fedora:
   stage: image
   allow_failure: true
-  before_script:
-    - docker info
   script:
-    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.labs.nic.cz
-    - docker build -t "knot-dns/fedora:latest" "scripts/docker/fedora:latest"
-    - docker tag "knot-dns/fedora:latest" "registry.labs.nic.cz/knot/knot-dns/fedora:latest"
-    - docker push "registry.labs.nic.cz/knot/knot-dns/fedora:latest"
+    - $DOCKER_CMD login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.labs.nic.cz
+    - $DOCKER_CMD build -t "knot-dns/fedora:latest" "scripts/docker/fedora:latest"
+    - $DOCKER_CMD tag "knot-dns/fedora:latest" "registry.labs.nic.cz/knot/knot-dns/fedora:latest"
+    - $DOCKER_CMD push "registry.labs.nic.cz/knot/knot-dns/fedora:latest"
+  after_script:
+    - rm -f "$HOME/.docker/$CI_JOB_ID/" # cleanup the credentials
   tags:
     - shell
     - linux
diff --git a/scripts/docker/centos:latest/Dockerfile b/scripts/docker/centos:latest/Dockerfile
index 0adfba1678612d0e0b6fc784e093a1d35f888d11..477dd757a8e12e13c3461b556956b11ea5559903 100644
--- a/scripts/docker/centos:latest/Dockerfile
+++ b/scripts/docker/centos:latest/Dockerfile
@@ -1,7 +1,6 @@
 FROM centos:latest
 MAINTAINER Knot DNS <knot-dns@labs.nic.cz>
 ENV DEBIAN_FRONTEND noninteractive
-ENV LC_ALL=C.UTF-8
 RUN yum -y upgrade
 RUN yum -y install epel-release
 RUN yum -y install \
diff --git a/scripts/docker/debian:latest/Dockerfile b/scripts/docker/debian:latest/Dockerfile
index 57443a9f35fdda925559bd58a10ffd6141d98b47..53d7fe15019baae4c43ea22a5668ef337f080c1a 100644
--- a/scripts/docker/debian:latest/Dockerfile
+++ b/scripts/docker/debian:latest/Dockerfile
@@ -1,7 +1,6 @@
 FROM debian:stable-slim
 MAINTAINER Knot DNS <knot-dns@labs.nic.cz>
 ENV DEBIAN_FRONTEND noninteractive
-ENV LC_ALL=C.UTF-8
 RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list
 RUN apt-get -y update
 RUN apt-get -y dist-upgrade
diff --git a/scripts/docker/fedora:latest/Dockerfile b/scripts/docker/fedora:latest/Dockerfile
index db7ebafa61f70852d7a5b45b0a5b3102c17f5e09..c2d43b94b42545500d7746d2414f7b21babe1416 100644
--- a/scripts/docker/fedora:latest/Dockerfile
+++ b/scripts/docker/fedora:latest/Dockerfile
@@ -1,7 +1,6 @@
 FROM fedora:latest
 MAINTAINER Knot DNS <knot-dns@labs.nic.cz>
 ENV DEBIAN_FRONTEND noninteractive
-ENV LC_ALL=C.UTF-8
 RUN dnf -y upgrade
 RUN dnf -y install \
 	'autoconf' \
diff --git a/scripts/docker/ubuntu:latest/Dockerfile b/scripts/docker/ubuntu:latest/Dockerfile
index bc5213cc6e38264b89989a88a0909e10e4d5b8ec..35c7162bc04cf5caa95b87af4f485ab7d10c8850 100644
--- a/scripts/docker/ubuntu:latest/Dockerfile
+++ b/scripts/docker/ubuntu:latest/Dockerfile
@@ -1,7 +1,6 @@
 FROM ubuntu:latest
 MAINTAINER Knot DNS <knot-dns@labs.nic.cz>
 ENV DEBIAN_FRONTEND noninteractive
-ENV LC_ALL=en_DK.UTF-8
 RUN apt-get -y update
 RUN apt-get -y dist-upgrade
 RUN apt-get -y install	\