diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65a0a05b..e7eaa66b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ variables:
   LC_ALL: C.UTF-8
   GIT_STRATEGY: fetch
   DOCKER_CMD: docker --config="$HOME/.docker/$CI_JOB_ID/"
-  IMG_BASE: registry.labs.nic.cz/labs/bird
+  IMG_BASE: registry.nic.cz/labs/bird
   TOOLS_DIR: /var/lib/gitlab-runner/bird-tools
 
 stages:
@@ -16,7 +16,7 @@ stages:
   stage: image
   allow_failure: true
   script:
-  - $DOCKER_CMD login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.labs.nic.cz
+  - $DOCKER_CMD login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.nic.cz
   # Make sure we refresh the base image if it updates (eg. security updates, etc)
   # If we do just the build, cache is always reused and the freshness of the
   # base image is never checked. However, pull always asks and updates the
@@ -234,131 +234,131 @@ docker_opensuse-15.3-amd64:
 
 build-debian-8-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:debian-8-amd64
+  image: registry.nic.cz/labs/bird:debian-8-amd64
 
 build-debian-8-i386:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:debian-8-i386
+  image: registry.nic.cz/labs/bird:debian-8-i386
 
 build-debian-9-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:debian-9-amd64
+  image: registry.nic.cz/labs/bird:debian-9-amd64
 
 build-debian-9-i386:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:debian-9-i386
+  image: registry.nic.cz/labs/bird:debian-9-i386
 
 build-debian-10-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:debian-10-amd64
+  image: registry.nic.cz/labs/bird:debian-10-amd64
 
 build-debian-10-i386:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:debian-10-i386
+  image: registry.nic.cz/labs/bird:debian-10-i386
 
 build-debian-11-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:debian-11-amd64
+  image: registry.nic.cz/labs/bird:debian-11-amd64
 
 #build-debian-11-i386:
 #  <<: *build-linux
-#  image: registry.labs.nic.cz/labs/bird:debian-11-i386
+#  image: registry.nic.cz/labs/bird:debian-11-i386
 
 build-debian-testing-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:debian-testing-amd64
+  image: registry.nic.cz/labs/bird:debian-testing-amd64
 
 #build-debian-testing-i386:
 #  <<: *build-linux
-#  image: registry.labs.nic.cz/labs/bird:debian-testing-i386
+#  image: registry.nic.cz/labs/bird:debian-testing-i386
 
 build-fedora-25-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:fedora-25-amd64
+  image: registry.nic.cz/labs/bird:fedora-25-amd64
 
 build-fedora-26-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:fedora-26-amd64
+  image: registry.nic.cz/labs/bird:fedora-26-amd64
 
 build-fedora-27-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:fedora-27-amd64
+  image: registry.nic.cz/labs/bird:fedora-27-amd64
 
 build-fedora-28-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:fedora-28-amd64
+  image: registry.nic.cz/labs/bird:fedora-28-amd64
 
 build-fedora-29-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:fedora-29-amd64
+  image: registry.nic.cz/labs/bird:fedora-29-amd64
 
 build-fedora-30-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:fedora-30-amd64
+  image: registry.nic.cz/labs/bird:fedora-30-amd64
 
 build-fedora-31-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:fedora-31-amd64
+  image: registry.nic.cz/labs/bird:fedora-31-amd64
 
 build-fedora-32-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:fedora-32-amd64
+  image: registry.nic.cz/labs/bird:fedora-32-amd64
 
 build-fedora-33-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:fedora-33-amd64
+  image: registry.nic.cz/labs/bird:fedora-33-amd64
 
 build-fedora-34-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:fedora-33-amd64
+  image: registry.nic.cz/labs/bird:fedora-33-amd64
 
 build-centos-7-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:centos-7-amd64
+  image: registry.nic.cz/labs/bird:centos-7-amd64
 
 build-centos-8-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:centos-8-amd64
+  image: registry.nic.cz/labs/bird:centos-8-amd64
 
 build-ubuntu-14_04-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:ubuntu-14.04-amd64
+  image: registry.nic.cz/labs/bird:ubuntu-14.04-amd64
 
 build-ubuntu-16_04-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:ubuntu-16.04-amd64
+  image: registry.nic.cz/labs/bird:ubuntu-16.04-amd64
 
 build-ubuntu-18_04-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:ubuntu-18.04-amd64
+  image: registry.nic.cz/labs/bird:ubuntu-18.04-amd64
 
 build-ubuntu-20_04-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:ubuntu-20.04-amd64
+  image: registry.nic.cz/labs/bird:ubuntu-20.04-amd64
 
 build-ubuntu-20_10-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:ubuntu-20.10-amd64
+  image: registry.nic.cz/labs/bird:ubuntu-20.10-amd64
 
 #build-ubuntu-21_04-amd64:
 #  <<: *build-linux
-#  image: registry.labs.nic.cz/labs/bird:ubuntu-21.04-amd64
+#  image: registry.nic.cz/labs/bird:ubuntu-21.04-amd64
 
 build-opensuse-15.0-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:opensuse-15.0-amd64
+  image: registry.nic.cz/labs/bird:opensuse-15.0-amd64
 
 build-opensuse-15.1-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:opensuse-15.1-amd64
+  image: registry.nic.cz/labs/bird:opensuse-15.1-amd64
 
 build-opensuse-15.2-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:opensuse-15.2-amd64
+  image: registry.nic.cz/labs/bird:opensuse-15.2-amd64
 
 build-opensuse-15.3-amd64:
   <<: *build-linux
-  image: registry.labs.nic.cz/labs/bird:opensuse-15.3-amd64
+  image: registry.nic.cz/labs/bird:opensuse-15.3-amd64
 
 build-freebsd-11-amd64:
   <<: *build-base
@@ -408,112 +408,112 @@ build-freebsd-11-i386:
 #pkg-debian-8-amd64:
 #  <<: *pkg-deb
 #  needs: [build-debian-8-amd64]
-#  image: registry.labs.nic.cz/labs/bird:debian-8-amd64
+#  image: registry.nic.cz/labs/bird:debian-8-amd64
 
 # Dpkg error: PATH is not set
 #pkg-debian-8-i386:
 #  <<: *pkg-deb
 #  needs: [build-debian-8-i386]
-#  image: registry.labs.nic.cz/labs/bird:debian-8-i386
+#  image: registry.nic.cz/labs/bird:debian-8-i386
 
 # Dpkg error: PATH is not set
 pkg-debian-9-amd64:
   <<: *pkg-deb
   needs: [build-debian-9-amd64]
-  image: registry.labs.nic.cz/labs/bird:debian-9-amd64
+  image: registry.nic.cz/labs/bird:debian-9-amd64
 
 # Dpkg error: PATH is not set
 pkg-debian-9-i386:
   <<: *pkg-deb
   needs: [build-debian-9-i386]
-  image: registry.labs.nic.cz/labs/bird:debian-9-i386
+  image: registry.nic.cz/labs/bird:debian-9-i386
 
 pkg-debian-10-amd64:
   <<: *pkg-deb
   needs: [build-debian-10-amd64]
-  image: registry.labs.nic.cz/labs/bird:debian-10-amd64
+  image: registry.nic.cz/labs/bird:debian-10-amd64
 
 pkg-debian-10-i386:
   <<: *pkg-deb
   needs: [build-debian-10-i386]
-  image: registry.labs.nic.cz/labs/bird:debian-10-i386
+  image: registry.nic.cz/labs/bird:debian-10-i386
 
 pkg-debian-11-amd64:
   <<: *pkg-deb
   needs: [build-debian-11-amd64]
-  image: registry.labs.nic.cz/labs/bird:debian-11-amd64
+  image: registry.nic.cz/labs/bird:debian-11-amd64
 
 pkg-fedora-30-amd64:
   <<: *pkg-rpm-wa
   needs: [build-fedora-30-amd64]
-  image: registry.labs.nic.cz/labs/bird:fedora-30-amd64
+  image: registry.nic.cz/labs/bird:fedora-30-amd64
 
 pkg-fedora-31-amd64:
   <<: *pkg-rpm-wa
   needs: [build-fedora-31-amd64]
-  image: registry.labs.nic.cz/labs/bird:fedora-31-amd64
+  image: registry.nic.cz/labs/bird:fedora-31-amd64
 
 pkg-fedora-32-amd64:
   <<: *pkg-rpm-wa
   needs: [build-fedora-32-amd64]
-  image: registry.labs.nic.cz/labs/bird:fedora-32-amd64
+  image: registry.nic.cz/labs/bird:fedora-32-amd64
 
 pkg-fedora-33-amd64:
   <<: *pkg-rpm-wa
   needs: [build-fedora-33-amd64]
-  image: registry.labs.nic.cz/labs/bird:fedora-33-amd64
+  image: registry.nic.cz/labs/bird:fedora-33-amd64
 
 pkg-fedora-34-amd64:
   <<: *pkg-rpm
   needs: [build-fedora-34-amd64]
-  image: registry.labs.nic.cz/labs/bird:fedora-34-amd64
+  image: registry.nic.cz/labs/bird:fedora-34-amd64
 
 pkg-centos-7-amd64:
   <<: *pkg-rpm-wa
   variables:
     LC_ALL: en_US.UTF-8
   needs: [build-centos-7-amd64]
-  image: registry.labs.nic.cz/labs/bird:centos-7-amd64
+  image: registry.nic.cz/labs/bird:centos-7-amd64
 
 pkg-centos-8-amd64:
   <<: *pkg-rpm-wa
   needs: [build-centos-8-amd64]
-  image: registry.labs.nic.cz/labs/bird:centos-8-amd64
+  image: registry.nic.cz/labs/bird:centos-8-amd64
 
 pkg-ubuntu-18.04-amd64:
   <<: *pkg-deb
   needs: [build-ubuntu-18_04-amd64]
-  image: registry.labs.nic.cz/labs/bird:ubuntu-18.04-amd64
+  image: registry.nic.cz/labs/bird:ubuntu-18.04-amd64
 
 pkg-ubuntu-20.04-amd64:
   <<: *pkg-deb
   needs: [build-ubuntu-20_04-amd64]
-  image: registry.labs.nic.cz/labs/bird:ubuntu-20.04-amd64
+  image: registry.nic.cz/labs/bird:ubuntu-20.04-amd64
 
 pkg-ubuntu-20.10-amd64:
   <<: *pkg-deb
   needs: [build-ubuntu-20_10-amd64]
-  image: registry.labs.nic.cz/labs/bird:ubuntu-20.10-amd64
+  image: registry.nic.cz/labs/bird:ubuntu-20.10-amd64
 
 #pkg-ubuntu-21.04-amd64:
 #  <<: *pkg-deb
 #  needs: [build-ubuntu-21_04-amd64]
-#  image: registry.labs.nic.cz/labs/bird:ubuntu-21.04-amd64
+#  image: registry.nic.cz/labs/bird:ubuntu-21.04-amd64
 
 pkg-opensuse-15.1-amd64:
   <<: *pkg-rpm-wa
   needs: [build-opensuse-15.1-amd64]
-  image: registry.labs.nic.cz/labs/bird:opensuse-15.1-amd64
+  image: registry.nic.cz/labs/bird:opensuse-15.1-amd64
 
 pkg-opensuse-15.2-amd64:
   <<: *pkg-rpm-wa
   needs: [build-opensuse-15.2-amd64]
-  image: registry.labs.nic.cz/labs/bird:opensuse-15.2-amd64
+  image: registry.nic.cz/labs/bird:opensuse-15.2-amd64
 
 pkg-opensuse-15.3-amd64:
   <<: *pkg-rpm-wa
   needs: [build-opensuse-15.3-amd64]
-  image: registry.labs.nic.cz/labs/bird:opensuse-15.3-amd64
+  image: registry.nic.cz/labs/bird:opensuse-15.3-amd64
 
 
 build-birdlab: