diff --git a/nomad/core.tf b/nomad/core.tf
new file mode 100644
index 0000000..eb0022e
--- /dev/null
+++ b/nomad/core.tf
@@ -0,0 +1,23 @@
+module "databases" {
+  source = "./databases"
+}
+
+module "blocky" {
+  source = "./blocky"
+
+  base_hostname = var.base_hostname
+  depends_on    = [module.databases]
+}
+
+module "traefik" {
+  source = "./traefik"
+
+  consul_address = var.consul_address
+  base_hostname  = var.base_hostname
+}
+
+module "metrics" {
+  source = "./metrics"
+
+  consul_address = var.consul_address
+}
diff --git a/nomad/services.tf b/nomad/services.tf
index 1cb9d8b..f0c2412 100644
--- a/nomad/services.tf
+++ b/nomad/services.tf
@@ -1,26 +1,3 @@
-module "databases" {
-  source = "./databases"
-}
-
-module "blocky" {
-  source = "./blocky"
-
-  base_hostname = var.base_hostname
-  depends_on    = [module.databases]
-}
-
-module "traefik" {
-  source = "./traefik"
-
-  consul_address = var.consul_address
-  base_hostname  = var.base_hostname
-}
-
-module "metrics" {
-  source = "./metrics"
-
-  consul_address = var.consul_address
-}
 
 module "nextcloud" {
   source = "./nextcloud"