diff --git a/modules/fstab.lua b/modules/fstab.lua
new file mode 100644
index 0000000..7585fac
--- /dev/null
+++ b/modules/fstab.lua
@@ -0,0 +1,13 @@
+local utils = require "../utils"
+local mounts = {
+	"tmpfs /tmp tmpfs defaults 0 0",
+}
+
+local function add_mount(mount)
+	table.insert(mounts, mount)
+	add_file("/etc/fstab", utils.join_table(mounts, "\n"))
+end
+
+modules.fstab = {
+    add_mount = add_mount,
+}
diff --git a/modules/runit.lua b/modules/runit.lua
index 5ed0204..ca149db 100644
--- a/modules/runit.lua
+++ b/modules/runit.lua
@@ -23,7 +23,7 @@ modules.runit = {
     add_service = add_service,
 }
 
-add_mount("tmpfs /var/log tmpfs defaults 0 0")
+modules.fstab.add_mount("tmpfs /var/log tmpfs defaults 0 0")
 
 -- Estos scripts fueron robados de Void Linux
 add_executable("/etc/runit/functions", [[
diff --git a/setup.lua b/setup.lua
index bf8883f..6c1185d 100644
--- a/setup.lua
+++ b/setup.lua
@@ -10,9 +10,6 @@ local packages = {
 	"libc-utils",
 	"alpine-keys",
 }
-local mounts = {
-	"tmpfs /tmp tmpfs defaults 0 0",
-}
 modules = {}
 
 local root = "./root"
@@ -20,9 +17,6 @@ local root = "./root"
 function add_packages(new_packages)
 	utils.table_concat(packages, new_packages)
 end
-function add_mount(new_mount)
-	table.insert(mounts, new_mount)
-end
 function add_file(path, content)
 	utils.expect_nil(alpine.write_file(root, path, content))
 end
@@ -43,13 +37,12 @@ local function module(name)
 	print("=> Module: " .. name)
 	require("modules/" .. name)
 end
+module "fstab"
 module "kernel"
 module "runit"
 module "hostname"
 module "dhcpcd"
 
-print("=> Writing fstab...")
-add_file("/etc/fstab", utils.join_table(mounts, "\n"))
 print("=> Installing and upgrading packages...")
 utils.expect_nil(alpine.make_world(root, packages))
 print("=> Setting password...")