diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 04f66ea..27c7842 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,14 +10,20 @@ nixos-unstable:
     NIXPKGS_CHANNEL: nixos-unstable
     IMAGE_TAG: latest
 
-nixos-19.03:
+nixos-20.03:
   stage: build
   script: nix-shell --run ./.gitlab-ci.sh
   variables:
-    NIXPKGS_CHANNEL: nixos-19.03
+    NIXPKGS_CHANNEL: nixos-20.03
 
 nixos-19.09:
   stage: build
   script: nix-shell --run ./.gitlab-ci.sh
   variables:
     NIXPKGS_CHANNEL: nixos-19.09
+
+nixos-19.03:
+  stage: build
+  script: nix-shell --run ./.gitlab-ci.sh
+  variables:
+    NIXPKGS_CHANNEL: nixos-19.03
diff --git a/.travis.yml b/.travis.yml
index 8bff0bd..1ed8ff4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,8 @@ matrix:
   include:
   - name: nixos-unstable
     env: NIXPKGS_CHANNEL=nixos-unstable IMAGE_TAG=latest
+  - name: nixos-20.03
+    env: NIXPKGS_CHANNEL=nixos-20.03
   - name: nixos-19.09
     env: NIXPKGS_CHANNEL=nixos-19.09
   - name: nixos-19.03
diff --git a/README.md b/README.md
index 117ceeb..4cc460e 100644
--- a/README.md
+++ b/README.md
@@ -58,8 +58,9 @@ nixpkgs channel describes.
 | Channel        | Image Tag   | Description                                       |
 | ---            | ---         | ---                                               |
 | nixos-unstable | latest      | latest and greated, major versions might change   |
-| nixos-19.03    | nixos-19.03 | only minor versions that include security updates |
+| nixos-20.03    | nixos-20.03 | next release, still baking                        |
 | nixos-19.09    | nixos-19.09 | only minor versions that include security updates |
+| nixos-19.03    | nixos-19.03 | only minor versions that include security updates |
 
 ## Docker Hub
 
@@ -69,23 +70,24 @@ All images are automatically built and pushed to Docker Hub.
 
 `> ./dockerhub-image-matrix`
 <!-- BEGIN mdsh -->
-| Image / Tag | latest | nixos-19.03 | nixos-19.09 |
-| ---         | ---    | ---         | ---         |
-| [nixpkgs/bash](https://hub.docker.com/r/nixpkgs/bash) | [![](https://images.microbadger.com/badges/image/nixpkgs/bash.svg)](https://microbadger.com/images/nixpkgs/bash) | [![](https://images.microbadger.com/badges/image/nixpkgs/bash:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/bash:nixos-19.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/bash:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/bash:nixos-19.09) |
-| [nixpkgs/busybox](https://hub.docker.com/r/nixpkgs/busybox) | [![](https://images.microbadger.com/badges/image/nixpkgs/busybox.svg)](https://microbadger.com/images/nixpkgs/busybox) | [![](https://images.microbadger.com/badges/image/nixpkgs/busybox:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/busybox:nixos-19.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/busybox:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/busybox:nixos-19.09) |
-| [nixpkgs/caddy](https://hub.docker.com/r/nixpkgs/caddy) | [![](https://images.microbadger.com/badges/image/nixpkgs/caddy.svg)](https://microbadger.com/images/nixpkgs/caddy) | [![](https://images.microbadger.com/badges/image/nixpkgs/caddy:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/caddy:nixos-19.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/caddy:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/caddy:nixos-19.09) |
-| [nixpkgs/couchpotato](https://hub.docker.com/r/nixpkgs/couchpotato) | [![](https://images.microbadger.com/badges/image/nixpkgs/couchpotato.svg)](https://microbadger.com/images/nixpkgs/couchpotato) | [![](https://images.microbadger.com/badges/image/nixpkgs/couchpotato:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/couchpotato:nixos-19.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/couchpotato:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/couchpotato:nixos-19.09) |
-| [nixpkgs/curl](https://hub.docker.com/r/nixpkgs/curl) | [![](https://images.microbadger.com/badges/image/nixpkgs/curl.svg)](https://microbadger.com/images/nixpkgs/curl) | [![](https://images.microbadger.com/badges/image/nixpkgs/curl:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/curl:nixos-19.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/curl:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/curl:nixos-19.09) |
-| [nixpkgs/devcontainer](https://hub.docker.com/r/nixpkgs/devcontainer) | [![](https://images.microbadger.com/badges/image/nixpkgs/devcontainer.svg)](https://microbadger.com/images/nixpkgs/devcontainer) | [![](https://images.microbadger.com/badges/image/nixpkgs/devcontainer:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/devcontainer:nixos-19.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/devcontainer:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/devcontainer:nixos-19.09) |
-| [nixpkgs/docker-compose](https://hub.docker.com/r/nixpkgs/docker-compose) | [![](https://images.microbadger.com/badges/image/nixpkgs/docker-compose.svg)](https://microbadger.com/images/nixpkgs/docker-compose) | [![](https://images.microbadger.com/badges/image/nixpkgs/docker-compose:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/docker-compose:nixos-19.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/docker-compose:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/docker-compose:nixos-19.09) |
-| [nixpkgs/kubectl](https://hub.docker.com/r/nixpkgs/kubectl) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubectl.svg)](https://microbadger.com/images/nixpkgs/kubectl) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubectl:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/kubectl:nixos-19.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubectl:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/kubectl:nixos-19.09) |
-| [nixpkgs/kubernetes-helm](https://hub.docker.com/r/nixpkgs/kubernetes-helm) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubernetes-helm.svg)](https://microbadger.com/images/nixpkgs/kubernetes-helm) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubernetes-helm:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/kubernetes-helm:nixos-19.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubernetes-helm:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/kubernetes-helm:nixos-19.09) |
-| [nixpkgs/nginx](https://hub.docker.com/r/nixpkgs/nginx) | [![](https://images.microbadger.com/badges/image/nixpkgs/nginx.svg)](https://microbadger.com/images/nixpkgs/nginx) | [![](https://images.microbadger.com/badges/image/nixpkgs/nginx:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/nginx:nixos-19.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/nginx:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/nginx:nixos-19.09) |
-| [nixpkgs/nix](https://hub.docker.com/r/nixpkgs/nix) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix.svg)](https://microbadger.com/images/nixpkgs/nix) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/nix:nixos-19.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/nix:nixos-19.09) |
-| [nixpkgs/nix-flakes](https://hub.docker.com/r/nixpkgs/nix-flakes) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix-flakes.svg)](https://microbadger.com/images/nixpkgs/nix-flakes) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix-flakes:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/nix-flakes:nixos-19.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix-flakes:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/nix-flakes:nixos-19.09) |
-| [nixpkgs/nix-unstable](https://hub.docker.com/r/nixpkgs/nix-unstable) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix-unstable.svg)](https://microbadger.com/images/nixpkgs/nix-unstable) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix-unstable:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/nix-unstable:nixos-19.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix-unstable:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/nix-unstable:nixos-19.09) |
+| Image / Tag | latest | nixos-20.03 | nixos-19.09 | nixos-19.03 |
+| ---         | ---    | ---         | ---         | ---         |
+| [nixpkgs/bash](https://hub.docker.com/r/nixpkgs/bash) | [![](https://images.microbadger.com/badges/image/nixpkgs/bash.svg)](https://microbadger.com/images/nixpkgs/bash) | [![](https://images.microbadger.com/badges/image/nixpkgs/bash:nixos-20.03.svg)](https://microbadger.com/images/nixpkgs/bash:nixos-20.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/bash:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/bash:nixos-19.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/bash:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/bash:nixos-19.03) |
+| [nixpkgs/busybox](https://hub.docker.com/r/nixpkgs/busybox) | [![](https://images.microbadger.com/badges/image/nixpkgs/busybox.svg)](https://microbadger.com/images/nixpkgs/busybox) | [![](https://images.microbadger.com/badges/image/nixpkgs/busybox:nixos-20.03.svg)](https://microbadger.com/images/nixpkgs/busybox:nixos-20.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/busybox:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/busybox:nixos-19.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/busybox:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/busybox:nixos-19.03) |
+| [nixpkgs/cachix](https://hub.docker.com/r/nixpkgs/cachix) | [![](https://images.microbadger.com/badges/image/nixpkgs/cachix.svg)](https://microbadger.com/images/nixpkgs/cachix) | [![](https://images.microbadger.com/badges/image/nixpkgs/cachix:nixos-20.03.svg)](https://microbadger.com/images/nixpkgs/cachix:nixos-20.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/cachix:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/cachix:nixos-19.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/cachix:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/cachix:nixos-19.03) |
+| [nixpkgs/caddy](https://hub.docker.com/r/nixpkgs/caddy) | [![](https://images.microbadger.com/badges/image/nixpkgs/caddy.svg)](https://microbadger.com/images/nixpkgs/caddy) | [![](https://images.microbadger.com/badges/image/nixpkgs/caddy:nixos-20.03.svg)](https://microbadger.com/images/nixpkgs/caddy:nixos-20.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/caddy:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/caddy:nixos-19.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/caddy:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/caddy:nixos-19.03) |
+| [nixpkgs/couchpotato](https://hub.docker.com/r/nixpkgs/couchpotato) | [![](https://images.microbadger.com/badges/image/nixpkgs/couchpotato.svg)](https://microbadger.com/images/nixpkgs/couchpotato) | [![](https://images.microbadger.com/badges/image/nixpkgs/couchpotato:nixos-20.03.svg)](https://microbadger.com/images/nixpkgs/couchpotato:nixos-20.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/couchpotato:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/couchpotato:nixos-19.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/couchpotato:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/couchpotato:nixos-19.03) |
+| [nixpkgs/curl](https://hub.docker.com/r/nixpkgs/curl) | [![](https://images.microbadger.com/badges/image/nixpkgs/curl.svg)](https://microbadger.com/images/nixpkgs/curl) | [![](https://images.microbadger.com/badges/image/nixpkgs/curl:nixos-20.03.svg)](https://microbadger.com/images/nixpkgs/curl:nixos-20.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/curl:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/curl:nixos-19.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/curl:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/curl:nixos-19.03) |
+| [nixpkgs/devcontainer](https://hub.docker.com/r/nixpkgs/devcontainer) | [![](https://images.microbadger.com/badges/image/nixpkgs/devcontainer.svg)](https://microbadger.com/images/nixpkgs/devcontainer) | [![](https://images.microbadger.com/badges/image/nixpkgs/devcontainer:nixos-20.03.svg)](https://microbadger.com/images/nixpkgs/devcontainer:nixos-20.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/devcontainer:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/devcontainer:nixos-19.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/devcontainer:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/devcontainer:nixos-19.03) |
+| [nixpkgs/docker-compose](https://hub.docker.com/r/nixpkgs/docker-compose) | [![](https://images.microbadger.com/badges/image/nixpkgs/docker-compose.svg)](https://microbadger.com/images/nixpkgs/docker-compose) | [![](https://images.microbadger.com/badges/image/nixpkgs/docker-compose:nixos-20.03.svg)](https://microbadger.com/images/nixpkgs/docker-compose:nixos-20.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/docker-compose:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/docker-compose:nixos-19.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/docker-compose:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/docker-compose:nixos-19.03) |
+| [nixpkgs/hugo](https://hub.docker.com/r/nixpkgs/hugo) | [![](https://images.microbadger.com/badges/image/nixpkgs/hugo.svg)](https://microbadger.com/images/nixpkgs/hugo) | [![](https://images.microbadger.com/badges/image/nixpkgs/hugo:nixos-20.03.svg)](https://microbadger.com/images/nixpkgs/hugo:nixos-20.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/hugo:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/hugo:nixos-19.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/hugo:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/hugo:nixos-19.03) |
+| [nixpkgs/kubectl](https://hub.docker.com/r/nixpkgs/kubectl) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubectl.svg)](https://microbadger.com/images/nixpkgs/kubectl) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubectl:nixos-20.03.svg)](https://microbadger.com/images/nixpkgs/kubectl:nixos-20.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubectl:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/kubectl:nixos-19.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubectl:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/kubectl:nixos-19.03) |
+| [nixpkgs/kubernetes-helm](https://hub.docker.com/r/nixpkgs/kubernetes-helm) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubernetes-helm.svg)](https://microbadger.com/images/nixpkgs/kubernetes-helm) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubernetes-helm:nixos-20.03.svg)](https://microbadger.com/images/nixpkgs/kubernetes-helm:nixos-20.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubernetes-helm:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/kubernetes-helm:nixos-19.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/kubernetes-helm:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/kubernetes-helm:nixos-19.03) |
+| [nixpkgs/nginx](https://hub.docker.com/r/nixpkgs/nginx) | [![](https://images.microbadger.com/badges/image/nixpkgs/nginx.svg)](https://microbadger.com/images/nixpkgs/nginx) | [![](https://images.microbadger.com/badges/image/nixpkgs/nginx:nixos-20.03.svg)](https://microbadger.com/images/nixpkgs/nginx:nixos-20.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/nginx:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/nginx:nixos-19.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/nginx:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/nginx:nixos-19.03) |
+| [nixpkgs/nix](https://hub.docker.com/r/nixpkgs/nix) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix.svg)](https://microbadger.com/images/nixpkgs/nix) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix:nixos-20.03.svg)](https://microbadger.com/images/nixpkgs/nix:nixos-20.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/nix:nixos-19.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/nix:nixos-19.03) |
+| [nixpkgs/nix-flakes](https://hub.docker.com/r/nixpkgs/nix-flakes) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix-flakes.svg)](https://microbadger.com/images/nixpkgs/nix-flakes) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix-flakes:nixos-20.03.svg)](https://microbadger.com/images/nixpkgs/nix-flakes:nixos-20.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix-flakes:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/nix-flakes:nixos-19.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix-flakes:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/nix-flakes:nixos-19.03) |
+| [nixpkgs/nix-unstable](https://hub.docker.com/r/nixpkgs/nix-unstable) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix-unstable.svg)](https://microbadger.com/images/nixpkgs/nix-unstable) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix-unstable:nixos-20.03.svg)](https://microbadger.com/images/nixpkgs/nix-unstable:nixos-20.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix-unstable:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/nix-unstable:nixos-19.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/nix-unstable:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/nix-unstable:nixos-19.03) |
 <!-- END mdsh -->
-
 ## Adding new images
 
 To add a new image to the project, create a new folder under
diff --git a/dockerhub-image-matrix b/dockerhub-image-matrix
index bf1b544..7a79c67 100755
--- a/dockerhub-image-matrix
+++ b/dockerhub-image-matrix
@@ -23,10 +23,10 @@ microbadge() {
 
 releases_json=$(nix-instantiate --strict --eval --json)
 
-echo "| Image / Tag | latest | nixos-19.03 | nixos-19.09 |"
-echo "| ---         | ---    | ---         | ---         |"
+echo "| Image / Tag | latest | nixos-20.03 | nixos-19.09 | nixos-19.03 |"
+echo "| ---         | ---    | ---         | ---         | ---         |"
 
 for attr in $(echo "$releases_json" | jq -r "keys[]") ; do
   name=nixpkgs/$attr
-  echo "| [$name](https://hub.docker.com/r/$name) | $(microbadge "$name") | $(microbadge "$name" "nixos-19.03") | $(microbadge "$name" "nixos-19.09") |"
+  echo "| [$name](https://hub.docker.com/r/$name) | $(microbadge "$name") | $(microbadge "$name" "nixos-20.03") | $(microbadge "$name" "nixos-19.09") | $(microbadge "$name" "nixos-19.03") |"
 done