diff --git a/docker/data.tf b/docker/data.tf
index f32c089..eb7a06d 100644
--- a/docker/data.tf
+++ b/docker/data.tf
@@ -11,3 +11,7 @@ data "docker_registry_image" "wikijs" {
 data "docker_registry_image" "ubooquity" {
   name = "linuxserver/ubooquity:latest"
 }
+
+data "docker_registry_image" "lychee" {
+  name = "linuxserver/lychee:latest"
+}
diff --git a/docker/images.tf b/docker/images.tf
index 7ba3ba5..22d72cd 100644
--- a/docker/images.tf
+++ b/docker/images.tf
@@ -12,3 +12,8 @@ resource "docker_image" "ubooquity" {
   name          = "${data.docker_registry_image.ubooquity.name}"
   pull_triggers = ["${data.docker_registry_image.ubooquity.sha256_digest}"]
 }
+
+resource "docker_image" "lychee" {
+  name          = "${data.docker_registry_image.lychee.name}"
+  pull_triggers = ["${data.docker_registry_image.lychee.sha256_digest}"]
+}
diff --git a/docker/lychee.tf b/docker/lychee.tf
new file mode 100644
index 0000000..079dcc5
--- /dev/null
+++ b/docker/lychee.tf
@@ -0,0 +1,37 @@
+resource "docker_container" "lychee" {
+  name  = "lychee"
+  image = "${docker_image.lychee.latest}"
+
+  restart               = "unless-stopped"
+  destroy_grace_seconds = 10
+  must_run              = true
+
+  volumes {
+    host_path      = "/mnt/xwing/config/lychee"
+    container_path = "/config"
+  }
+
+  volumes {
+    host_path      = "/mnt/xwing/data/lychee"
+    container_path = "/pictures"
+  }
+
+  upload {
+    content = "${file("${path.module}/conf/lychee.php.ini")}"
+    file    = "/config/lychee/user.ini"
+  }
+
+  labels = "${merge(
+    local.traefik_common_labels,
+    map(
+      "traefik.port", 80,
+      "traefik.frontend.rule", "Host:pics.${var.domain}",
+  ))}"
+
+  env = [
+    "PUID=986",
+    "PGID=984",
+  ]
+
+  # links = ["${var.links-mariadb}"]
+}
diff --git a/docker/outputs.tf b/docker/outputs.tf
index a41efd4..d0fa477 100644
--- a/docker/outputs.tf
+++ b/docker/outputs.tf
@@ -1,3 +1,7 @@
+output "lychee-ip" {
+  value = "${docker_container.lychee.ip_address}"
+}
+
 output "names-traefik" {
   value = "${docker_container.traefik.name}"
 }
diff --git a/lychee.tf b/lychee.tf
deleted file mode 100644
index b97c530..0000000
--- a/lychee.tf
+++ /dev/null
@@ -1,29 +0,0 @@
-module "lychee" {
-  source = "modules/container"
-  name   = "lychee"
-  image  = "linuxserver/lychee:latest"
-
-  volumes = [{
-    host_path      = "/mnt/xwing/config/lychee"
-    container_path = "/config"
-  },
-    {
-      host_path      = "/mnt/xwing/data/lychee"
-      container_path = "/pictures"
-    },
-  ]
-
-  files = "/config/lychee/user.ini"
-
-  contents = ["${file("${path.module}/docker/conf/lychee.php.ini")}"]
-
-  web {
-    expose = true
-    host   = "pics.bb8.fun"
-  }
-
-  env = [
-    "PUID=986",
-    "PGID=984",
-  ]
-}