diff --git a/main.tf b/main.tf
index a8288f6..a246b37 100644
--- a/main.tf
+++ b/main.tf
@@ -25,6 +25,11 @@ module "docker" {
   domain              = "bb8.fun"
 }
 
+module "timemachine" {
+  source = "timemachine"
+  ips    = "${var.ips}"
+}
+
 module "gitea" {
   source         = "gitea"
   domain         = "git.captnemo.in"
diff --git a/media/airsonic.tf b/media/airsonic.tf
index 08595ff..c399499 100644
--- a/media/airsonic.tf
+++ b/media/airsonic.tf
@@ -45,7 +45,7 @@ resource "docker_container" "airsonic" {
     "PUID=1004",
     "PGID=1003",
     "TZ=Asia/Kolkata",
-    "JAVA_OPTS=-Xmx512m -Xms512m",
+    "JAVA_OPTS=-Xmx512m",
   ]
   links = ["${var.links-mariadb}"]
 }
diff --git a/monitoring/data.tf b/monitoring/data.tf
index 2b39eaa..dbc2976 100644
--- a/monitoring/data.tf
+++ b/monitoring/data.tf
@@ -1,5 +1,5 @@
 data "docker_registry_image" "grafana" {
-  name = "grafana/grafana:5.0.1"
+  name = "grafana/grafana:latest"
 }
 
 data "docker_registry_image" "prometheus" {
diff --git a/monitoring/grafana.tf b/monitoring/grafana.tf
index 131c890..59fbe96 100644
--- a/monitoring/grafana.tf
+++ b/monitoring/grafana.tf
@@ -16,8 +16,10 @@ resource docker_container "grafana" {
   links = ["${docker_container.prometheus.name}"]
 
   env = [
-    "GF_SECURITY_ADMIN_PASSWORD=${var.gf-security-admin-password}",
+    # Keep this disabled unless bringing up a new grafana instance
+    # "GF_SECURITY_ADMIN_PASSWORD=${var.gf-security-admin-password}",
     "GF_SERVER_ROOT_URL=https://grafana.${var.domain}",
+
     "GF_AUTH_ANONYMOUS_ENABLED=true",
     "GF_AUTH_ANONYMOUS_ORG_NAME=Tatooine",
   ]
diff --git a/timemachine/main.tf b/timemachine/main.tf
new file mode 100644
index 0000000..f707054
--- /dev/null
+++ b/timemachine/main.tf
@@ -0,0 +1,34 @@
+data "docker_registry_image" "timemachine" {
+  name = "odarriba/timemachine:latest"
+}
+
+resource "docker_image" "timemachine" {
+  name          = "${data.docker_registry_image.timemachine.name}"
+  pull_triggers = ["${data.docker_registry_image.timemachine.sha256_digest}"]
+}
+
+resource docker_container "timemachine" {
+  name  = "timemachine"
+  image = "${docker_image.timemachine.latest}"
+
+  volumes {
+    host_path      = "/mnt/xwing/data/timemachine"
+    container_path = "/timemachine"
+  }
+
+  ports {
+    internal = 548
+    external = 548
+    ip       = "${var.ips["eth0"]}"
+  }
+
+  ports {
+    internal = 636
+    external = 636
+    ip       = "${var.ips["eth0"]}"
+  }
+
+  restart               = "unless-stopped"
+  destroy_grace_seconds = 10
+  must_run              = true
+}
diff --git a/timemachine/variables.tf b/timemachine/variables.tf
new file mode 100644
index 0000000..f7b7a99
--- /dev/null
+++ b/timemachine/variables.tf
@@ -0,0 +1,3 @@
+variable "ips" {
+  type = "map"
+}