diff --git a/terraform/main.tf b/terraform/main.tf
index bc82e01..1c9cd32 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -25,10 +25,10 @@ provider "libvirt" {
 }
 
 module "maestro" {
-  source          = "../../tf-modules/debian"
+  source          = "git::https://git.kun.is/home/tf-modules.git//debian"
   name            = "maestro"
   domain_name     = "tf-maestro"
-  memory          = 1024 * 10
+  memory          = 10240
   mac             = "CA:FE:C0:FF:EE:08"
   providers = {
     libvirt = libvirt
@@ -36,67 +36,11 @@ module "maestro" {
 }
 
 module "bancomart" {
-  source          = "../../tf-modules/debian"
+  source          = "git::https://git.kun.is/home/tf-modules.git//debian"
   name            = "bancomart"
   domain_name     = "tf-bancomart"
-  memory          = 1024 * 10
+  memory          = 10240
   providers = {
     libvirt = libvirt.jefke
   }
 }
-
-#module "manager" {
-#  source          = "git::https://git.kun.is/home/tf-modules.git//debian"
-#  name            = "maestro"
-#  domain_name     = "tf-maestro"
-#  memory          = 1024
-#  mac             = "CA:FE:C0:FF:EE:08"
-#  hypervisor_host = "atlas.hyp"
-#  providers = {
-#    libvirt = libvirt
-#  }
-#}
-#
-#module "swarmpub1" {
-#  source          = "git::https://git.kun.is/home/tf-modules.git//debian"
-#  name            = "swarmpub1"
-#  domain_name     = "tf-swarmpub1"
-#  memory          = 1024 * 5
-#  hypervisor_host = "atlas.hyp"
-#  providers = {
-#    libvirt = libvirt
-#  }
-#}
-#
-#module "swarmpriv1" {
-#  source          = "git::https://git.kun.is/home/tf-modules.git//debian"
-#  name            = "swarmpriv1"
-#  domain_name     = "tf-swarmpriv1"
-#  memory          = 1024 * 5
-#  hypervisor_host = "atlas.hyp"
-#  providers = {
-#    libvirt = libvirt
-#  }
-#}
-#
-#module "swarmpub2" {
-#  source          = "git::https://git.kun.is/home/tf-modules.git//debian"
-#  name            = "swarmpub2"
-#  domain_name     = "tf-swarmpub2"
-#  memory          = 1024 * 3
-#  hypervisor_host = "jefke.hyp"
-#  providers = {
-#    libvirt = libvirt.jefke
-#  }
-#}
-#
-#module "swarmpriv2" {
-#  source          = "git::https://git.kun.is/home/tf-modules.git//debian"
-#  name            = "swarmpriv2"
-#  domain_name     = "tf-swarmpriv2"
-#  memory          = 1024 * 3
-#  hypervisor_host = "jefke.hyp"
-#  providers = {
-#    libvirt = libvirt.jefke
-#  }
-#}