diff --git a/README.md b/README.md
index 4cc460e..bf4aa72 100644
--- a/README.md
+++ b/README.md
@@ -75,6 +75,7 @@ All images are automatically built and pushed to Docker Hub.
 | [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/cachix-flakes](https://hub.docker.com/r/nixpkgs/cachix-flakes) | [![](https://images.microbadger.com/badges/image/nixpkgs/cachix-flakes.svg)](https://microbadger.com/images/nixpkgs/cachix-flakes) | [![](https://images.microbadger.com/badges/image/nixpkgs/cachix-flakes:nixos-20.03.svg)](https://microbadger.com/images/nixpkgs/cachix-flakes:nixos-20.03) | [![](https://images.microbadger.com/badges/image/nixpkgs/cachix-flakes:nixos-19.09.svg)](https://microbadger.com/images/nixpkgs/cachix-flakes:nixos-19.09) | [![](https://images.microbadger.com/badges/image/nixpkgs/cachix-flakes:nixos-19.03.svg)](https://microbadger.com/images/nixpkgs/cachix-flakes: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) |
diff --git a/images/cachix-flakes/default.nix b/images/cachix-flakes/default.nix
new file mode 100644
index 0000000..c82f1d1
--- /dev/null
+++ b/images/cachix-flakes/default.nix
@@ -0,0 +1,6 @@
+{ docker-nixpkgs
+, nixFlakes
+}:
+docker-nixpkgs.cachix.override {
+  nix = nixFlakes;
+}
diff --git a/images/cachix/default.nix b/images/cachix/default.nix
index 65925a9..bc188ad 100644
--- a/images/cachix/default.nix
+++ b/images/cachix/default.nix
@@ -1,7 +1,9 @@
 { docker-nixpkgs
 , cachix
+, nix
 }:
 (docker-nixpkgs.nix.override {
+  nix = nix;
   extraContents = [ cachix ];
 }).overrideAttrs (prev: {
   meta = (prev.meta or {}) // {