diff --git a/flake.lock b/flake.lock
index 64450408..010425b8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,7 +3,9 @@
     "deploy-rs": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "utils": "utils"
       },
       "locked": {
@@ -20,25 +22,6 @@
         "type": "github"
       }
     },
-    "deploy-rs_2": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "nixpkgs": "nixpkgs_4",
-        "utils": "utils_3"
-      },
-      "locked": {
-        "lastModified": 1648475189,
-        "narHash": "sha256-gAGAS6IagwoUr1B0ohE3iR6sZ8hP4LSqzYLC8Mq3WGU=",
-        "owner": "serokell",
-        "repo": "deploy-rs",
-        "rev": "83e0c78291cd08cb827ba0d553ad9158ae5a95c3",
-        "type": "github"
-      },
-      "original": {
-        "id": "deploy-rs",
-        "type": "indirect"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -56,22 +39,6 @@
       }
     },
     "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1648199409,
-        "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_3": {
       "flake": false,
       "locked": {
         "lastModified": 1627913399,
@@ -86,7 +53,7 @@
         "type": "indirect"
       }
     },
-    "flake-compat_4": {
+    "flake-compat_3": {
       "flake": false,
       "locked": {
         "lastModified": 1627913399,
@@ -194,15 +161,17 @@
     },
     "minecraft-servers": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "utils": "utils_2"
       },
       "locked": {
-        "lastModified": 1652836211,
-        "narHash": "sha256-+RKdIiGZgNCpZuT+Jb33iJ9vxLfS9JKXGVY0RHJQUZ0=",
+        "lastModified": 1653182293,
+        "narHash": "sha256-eLl3PHCzpX8eFES+S9WrC8jGhWjczbTvWAPMeuJOd4s=",
         "owner": "jyooru",
         "repo": "nix-minecraft-servers",
-        "rev": "9a523a917319a85d9dc8314e4972225ac2867a36",
+        "rev": "f09d761e4063e9158555817d03b0f2a7f2bff709",
         "type": "github"
       },
       "original": {
@@ -214,7 +183,7 @@
     "nix": {
       "inputs": {
         "lowdown-src": "lowdown-src",
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1633098935,
@@ -232,7 +201,7 @@
     "nix_2": {
       "inputs": {
         "lowdown-src": "lowdown-src_2",
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1633098935,
@@ -248,38 +217,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1648219316,
-        "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1652133925,
-        "narHash": "sha256-kfATGChLe9/fQVZkXN9G71JAVMlhePv1qDbaRKklkQs=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "51d859cdab1ef58755bd342d45352fc607f5e59b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1653052942,
         "narHash": "sha256-Dt0jodCSLHVqE7yVxIoX1q4jA5uAWbVJHnaDa8HkJ4A=",
@@ -295,23 +232,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1648219316,
-        "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1632864508,
         "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=",
@@ -326,21 +247,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1632495107,
-        "narHash": "sha256-4NGE56r+FJGBaCYu3CTH4O83Ys4TrtnEPXrvdwg1TDs=",
-        "owner": "serokell",
-        "repo": "nixpkgs",
-        "rev": "be220b2dc47092c1e739bf6aaf630f29e71fe1c4",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_7": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1632864508,
         "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=",
@@ -355,44 +262,34 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_8": {
-      "locked": {
-        "lastModified": 1632495107,
-        "narHash": "sha256-4NGE56r+FJGBaCYu3CTH4O83Ys4TrtnEPXrvdwg1TDs=",
-        "owner": "serokell",
-        "repo": "nixpkgs",
-        "rev": "be220b2dc47092c1e739bf6aaf630f29e71fe1c4",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
     "root": {
       "inputs": {
         "deploy-rs": "deploy-rs",
         "minecraft-servers": "minecraft-servers",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs",
         "serokell-nix": "serokell-nix",
         "vault-secrets": "vault-secrets"
       }
     },
     "serokell-nix": {
       "inputs": {
-        "deploy-rs": "deploy-rs_2",
-        "flake-compat": "flake-compat_3",
+        "deploy-rs": [
+          "deploy-rs"
+        ],
+        "flake-compat": "flake-compat_2",
         "flake-utils": "flake-utils_2",
         "gitignore-nix": "gitignore-nix",
         "nix": "nix",
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1652967482,
-        "narHash": "sha256-wFiXqPQzx9B3p2z1SqfL6zURUfLIKgKSUCIDr6OdKUE=",
+        "lastModified": 1653109065,
+        "narHash": "sha256-E4kflprq80xWtt/ApTP0lAyi4oryFV/FI53S+VmiI0Q=",
         "owner": "serokell",
         "repo": "serokell.nix",
-        "rev": "d90dc16c0a90288a0615e17f8ec4c6544fc8cc7a",
+        "rev": "bbccb5df8013b1bd86b8445bd8e39c396a0521cc",
         "type": "github"
       },
       "original": {
@@ -434,27 +331,14 @@
         "type": "github"
       }
     },
-    "utils_3": {
-      "locked": {
-        "lastModified": 1648297722,
-        "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "vault-secrets": {
       "inputs": {
-        "flake-compat": "flake-compat_4",
+        "flake-compat": "flake-compat_3",
         "flake-utils": "flake-utils_3",
         "nix": "nix_2",
-        "nixpkgs": "nixpkgs_8"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1633626134,
diff --git a/flake.nix b/flake.nix
index 2564a639..c2dd2d5c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,12 +6,20 @@
   # * https://git.voidcorp.nl/j00lz/nixos-configs/src/branch/main/flake.nix
 
   inputs = {
-    deploy-rs.url = "github:serokell/deploy-rs";
-    # nixpkgs.url = "github:nixos/nixpkgs/master";
     nixpkgs.url = "github:NULLx76/nixpkgs/0x76";
+    
+    deploy-rs.url = "github:serokell/deploy-rs";
+    deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
+    
     serokell-nix.url = "github:serokell/serokell.nix";
+    serokell-nix.inputs.nixpkgs.follows = "nixpkgs";
+    serokell-nix.inputs.deploy-rs.follows = "deploy-rs";
+    
     vault-secrets.url = "github:serokell/vault-secrets";
+    vault-secrets.inputs.nixpkgs.follows = "nixpkgs";
+
     minecraft-servers.url = "github:jyooru/nix-minecraft-servers";
+    minecraft-servers.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs =
diff --git a/flux/cluster/apps/gitops/renovate/renovate-infrastructure.yaml b/flux/cluster/apps/gitops/renovate/renovate-infrastructure.yaml
index a7a3979a..29a5fabd 100644
--- a/flux/cluster/apps/gitops/renovate/renovate-infrastructure.yaml
+++ b/flux/cluster/apps/gitops/renovate/renovate-infrastructure.yaml
@@ -74,7 +74,7 @@ data:
       "packageRules": [
         {
           "automerge": true,
-          "automergeType": "branch",
+          "automergeType": "pr",
           "matchPackageNames": [
             "renovate/renovate"
           ]