diff --git a/nix/os/containers/backup-target.nix b/nix/os/containers/backup-target.nix
index 0af7fb6..6ac91a0 100644
--- a/nix/os/containers/backup-target.nix
+++ b/nix/os/containers/backup-target.nix
@@ -29,6 +29,8 @@
         btrfsProgs
         # btrbk
       ];
+
+      isSystemUser = true;
     };
 
     security.sudo = {
diff --git a/nix/os/devices/vmd32387.contaboserver.net/hw.nix b/nix/os/devices/vmd32387.contaboserver.net/hw.nix
index 75d5aae..6ab2dec 100644
--- a/nix/os/devices/vmd32387.contaboserver.net/hw.nix
+++ b/nix/os/devices/vmd32387.contaboserver.net/hw.nix
@@ -4,7 +4,6 @@ let
   stage1Modules =  [
     "aesni_intel"
     "kvm-intel"
-    "aes_x86_64"
 
     "virtio_balloon"
     "virtio_scsi"
diff --git a/nix/os/devices/vmd32387.contaboserver.net/versions.tmpl.nix b/nix/os/devices/vmd32387.contaboserver.net/versions.tmpl.nix
index 399cefe..0fbcb19 100644
--- a/nix/os/devices/vmd32387.contaboserver.net/versions.tmpl.nix
+++ b/nix/os/devices/vmd32387.contaboserver.net/versions.tmpl.nix
@@ -1,8 +1,8 @@
 let
   nixpkgs = {
     url = "https://github.com/NixOS/nixpkgs/";
-    ref = "nixos-20.09";
-    rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-20.09 | awk '{ print $1 }' | tr -d '\n' -%>";
+    ref = "nixos-21.05";
+    rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.05 | awk '{ print $1 }' | tr -d '\n' -%>";
   };
 in
 
@@ -12,6 +12,11 @@ in
     suffix = "/nixos";
   };
   "channels-nixos-stable" = nixpkgs;
+  "channels-nixos-20.09" = {
+    url = "https://github.com/NixOS/nixpkgs/";
+    ref = "nixos-20.09";
+    rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-20.09 | awk '{ print $1 }' | tr -d '\n' -%>";
+  };
   "channels-nixos-20.03" = {
     url = "https://github.com/NixOS/nixpkgs/";
     ref = "nixos-20.03";
@@ -34,7 +39,7 @@ in
   };
   "home-manager-module" = {
     url = "https://github.com/nix-community/home-manager";
-    ref = "release-20.09";
-    rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-20.09 | awk '{ print $1 }' | tr -d '\n' -%>";
+    ref = "release-21.05";
+    rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-21.05 | awk '{ print $1 }' | tr -d '\n' -%>";
   };
 }