diff --git a/external/versions.tf b/external/versions.tf
index b441bdf9..e5af7345 100644
--- a/external/versions.tf
+++ b/external/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.6.0"
+  required_version = "~> 1.8"
 
   backend "remote" {
     hostname     = "app.terraform.io"
diff --git a/flake.lock b/flake.lock
index d562aee4..4fd50192 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -20,16 +20,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1704295289,
-        "narHash": "sha256-9WZDRfpMqCYL6g/HNWVvXF0hxdaAgwgIGeLYiOhmes8=",
+        "lastModified": 1725001927,
+        "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b0b2c5445c64191fd8d0b31f2b1a34e45a64547d",
+        "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 8fc06045..ccd21675 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "Homelab";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     flake-utils.url = "github:numtide/flake-utils";
   };
 
diff --git a/test/tools_test.go b/test/tools_test.go
index a3284183..d2c95ab1 100644
--- a/test/tools_test.go
+++ b/test/tools_test.go
@@ -17,14 +17,14 @@ func TestToolsVersions(t *testing.T) {
 		versionConstraint string
 	}{
 		{"ansible", "--version", ">= 2.12.6, < 3.0.0"},
-		{"docker", "--version", ">= 24.0.0, < 25.0.0"},
+		{"docker", "--version", ">= 25.0.0, < 26.0.0"},
 		{"git", "--version", ">= 2.37.1, < 3.0.0"},
-		{"go", "version", ">= 1.21.0, < 1.22.0"},
+		{"go", "version", ">= 1.22.0, < 1.23.0"},
 		{"helm", "version", ">= 3.9.4, < 4.0.0"},
-		{"kubectl", "version", ">= 1.27.0, < 1.29.0"}, // https://kubernetes.io/releases/version-skew-policy/#kubectl
+		{"kubectl", "version", ">= 1.30.0, < 1.32.0"}, // https://kubernetes.io/releases/version-skew-policy/#kubectl
 		{"kustomize", "version", ">= 5.0.3, < 6.0.0"},
 		{"pre-commit", "--version", ">= 3.3.2, < 4.0.0"},
-		{"terraform", "--version", ">= 1.6.0, < 1.7.0"},
+		{"terraform", "--version", ">= 1.8.0, < 1.9.0"},
 	}
 
 	for _, tool := range tools {