diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..04a7545
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "ansible/roles/cloudalchemy.node-exporter"]
+	path = ansible/roles/cloudalchemy.node-exporter
+	url = https://github.com/cloudalchemy/ansible-node-exporter.git
diff --git a/ansible/group_vars/all b/ansible/group_vars/all
index ab20f22..55e2b13 100644
--- a/ansible/group_vars/all
+++ b/ansible/group_vars/all
@@ -6,7 +6,14 @@ event:
 
 # Monitoring
 
-monitoring_server: https://monitoring.fossasia.makerforce.io
+node_exporter_textfile_dir: /var/lib/node_exporter
+node_exporter_enabled_collectors:
+- ntp
+- wifi
+- systemd:
+    unit-whitelist: "'.+\\.service'"
+- textfile:
+    directory: "{{ node_exporter_textfile_dir }}"
 
 # Meta
 
diff --git a/ansible/recorders.yml b/ansible/recorders.yml
index 9e6e738..d541ce0 100644
--- a/ansible/recorders.yml
+++ b/ansible/recorders.yml
@@ -7,4 +7,6 @@
   roles:
     - role: laptop
     - role: recorder
-    - role: monitoring-client
+    - role: cloudalchemy.node-exporter
+      tags: node_exporter
+
diff --git a/ansible/roles/cloudalchemy.node-exporter b/ansible/roles/cloudalchemy.node-exporter
new file mode 160000
index 0000000..05481aa
--- /dev/null
+++ b/ansible/roles/cloudalchemy.node-exporter
@@ -0,0 +1 @@
+Subproject commit 05481aa973044de98009925f61e440ddc224a75a
diff --git a/ansible/roles/monitoring-client/tasks/main.yml b/ansible/roles/monitoring-client/tasks/main.yml
deleted file mode 100644
index cd21505..0000000
--- a/ansible/roles/monitoring-client/tasks/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-