diff --git a/nix/os/containers/backup-target.nix b/nix/os/containers/backup-target.nix
index 6ac91a0..40d348e 100644
--- a/nix/os/containers/backup-target.nix
+++ b/nix/os/containers/backup-target.nix
@@ -19,6 +19,7 @@
 
     users.extraUsers."${containerBackupCfg.user}" = {
       uid = 2000;
+      group = containerBackupCfg.group;
       shell = pkgs.bashInteractive;
       home = "/${containerBackupCfg.targetPath}";
       openssh.authorizedKeys.keys = [
diff --git a/nix/os/devices/167.233.1.14/versions.nix b/nix/os/devices/167.233.1.14/versions.nix
index cae9773..ef51563 100644
--- a/nix/os/devices/167.233.1.14/versions.nix
+++ b/nix/os/devices/167.233.1.14/versions.nix
@@ -1,18 +1,23 @@
 let
   nixpkgs = {
     url = "https://github.com/NixOS/nixpkgs/";
-    ref = "nixos-21.05";
-    rev = "a1007637cea374bd1bafd754cfd5388894c49129";
+    ref = "nixos-21.11";
+    rev = "e34c5379866833f41e2a36f309912fa675d687c7";
   };
 in
 
 {
   inherit nixpkgs;
   "channels-nixos-stable" = nixpkgs;
+  "channels-nixos-21.05" = {
+    url = "https://github.com/NixOS/nixpkgs/";
+    ref = "nixos-21.05";
+    rev = "";
+  };
   "channels-nixos-20.09" = {
     url = "https://github.com/NixOS/nixpkgs/";
     ref = "nixos-20.09";
-    rev = "068984c00e0d4e54b6684d98f6ac47c92dcb642e";
+    rev = "1c1f5649bb9c1b0d98637c8c365228f57126f361";
   };
   "channels-nixos-20.03" = {
     url = "https://github.com/NixOS/nixpkgs/";
@@ -27,16 +32,16 @@ in
   "channels-nixos-unstable" = {
     url = "https://github.com/NixOS/nixpkgs/";
     ref = "nixos-unstable";
-    rev = "253aecf69ed7595aaefabde779aa6449195bebb7";
+    rev = "c71f061c68ba8ce53471b767d5049cbd0f3d8490";
   };
   "nixpkgs-master" = {
     url = "https://github.com/NixOS/nixpkgs/";
     ref = "master";
-    rev = "77506e4f258f1922148986a73a713006318e9fe9";
+    rev = "fb881b80f64d1b672135533a8c2fbc86e6ed8898";
   };
   "home-manager-module" = {
     url = "https://github.com/nix-community/home-manager";
     ref = "release-21.05";
-    rev = "b39647e52ed3c0b989e9d5c965e598ae4c38d7ef";
+    rev = "7329ffc6e911106494183557fc249180d5422929";
   };
 }
diff --git a/nix/os/devices/167.233.1.14/versions.tmpl.nix b/nix/os/devices/167.233.1.14/versions.tmpl.nix
index f05d0dc..2ad257f 100644
--- a/nix/os/devices/167.233.1.14/versions.tmpl.nix
+++ b/nix/os/devices/167.233.1.14/versions.tmpl.nix
@@ -1,14 +1,19 @@
 let
   nixpkgs = {
     url = "https://github.com/NixOS/nixpkgs/";
-    ref = "nixos-21.05";
-    rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.05 | awk '{ print $1 }' | tr -d '\n' -%>";
+    ref = "nixos-21.11";
+    rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.11 | awk '{ print $1 }' | tr -d '\n' -%>";
   };
 in
 
 {
   inherit nixpkgs;
   "channels-nixos-stable" = nixpkgs;
+  "channels-nixos-21.05" = {
+    url = "https://github.com/NixOS/nixpkgs/";
+    ref = "nixos-21.05";
+    rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-20.05 | awk '{ print $1 }' | tr -d '\n' -%>";
+  };
   "channels-nixos-20.09" = {
     url = "https://github.com/NixOS/nixpkgs/";
     ref = "nixos-20.09";
diff --git a/nix/os/devices/vmd32387.contaboserver.net/versions.tmpl.nix b/nix/os/devices/vmd32387.contaboserver.net/versions.tmpl.nix
index 0fbcb19..30642d3 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-21.05";
-    rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.05 | awk '{ print $1 }' | tr -d '\n' -%>";
+    ref = "nixos-21.11";
+    rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.11 | awk '{ print $1 }' | tr -d '\n' -%>";
   };
 in
 
@@ -12,6 +12,11 @@ in
     suffix = "/nixos";
   };
   "channels-nixos-stable" = nixpkgs;
+  "channels-nixos-21.05" = {
+    url = "https://github.com/NixOS/nixpkgs/";
+    ref = "nixos-21.05";
+    rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-20.05 | awk '{ print $1 }' | tr -d '\n' -%>";
+  };
   "channels-nixos-20.09" = {
     url = "https://github.com/NixOS/nixpkgs/";
     ref = "nixos-20.09";
diff --git a/nix/variables/passwords.crypt.nix b/nix/variables/passwords.crypt.nix
index d91b782..3b28981 100644
Binary files a/nix/variables/passwords.crypt.nix and b/nix/variables/passwords.crypt.nix differ