diff --git a/main.tf b/main.tf
index 7aa8c1f..b4599a3 100644
--- a/main.tf
+++ b/main.tf
@@ -50,7 +50,6 @@ module "opml" {
   domain             = "opml.bb8.fun"
   client-id          = "${var.opml-github-client-id}"
   client-secret      = "${var.opml-github-client-secret}"
-  traefik-labels     = "${var.traefik-common-labels}"
   traefik-network-id = "${module.docker.traefik-network-id}"
 }
 
diff --git a/opml/data.tf b/opml/data.tf
deleted file mode 100644
index ee0c40a..0000000
--- a/opml/data.tf
+++ /dev/null
@@ -1,7 +0,0 @@
-data "docker_registry_image" "opml" {
-  name = "captn3m0/opml-gen:latest"
-}
-
-data "docker_registry_image" "redis" {
-  name = "redis:alpine"
-}
diff --git a/opml/main.tf b/opml/main.tf
index bd495b0..24094de 100644
--- a/opml/main.tf
+++ b/opml/main.tf
@@ -1,12 +1,13 @@
-resource "docker_container" "opml" {
-  name  = "opml"
-  image = "${docker_image.opml.latest}"
+module "opml" {
+  name     = "opml"
+  source   = "../modules/container"
+  image    = "captn3m0/opml-gen:latest"
+  networks = ["${docker_network.opml.id}", "${var.traefik-network-id}"]
 
-  labels = "${merge(
-    var.traefik-labels, map(
-      "traefik.port", 80,
-      "traefik.frontend.rule","Host:${var.domain}"
-  ))}"
+  web {
+    expose = true
+    host   = "opml.${var.domain}"
+  }
 
   env = [
     "GITHUB_CLIENT_ID=${var.client-id}",
@@ -14,15 +15,7 @@ resource "docker_container" "opml" {
     "REDIS_URL=redis://opml-redis:6379/1",
   ]
 
-  memory                = 256
-  restart               = "unless-stopped"
-  destroy_grace_seconds = 10
-  must_run              = true
-
-  networks = ["${docker_network.opml.id}", "${var.traefik-network-id}"]
-}
-
-resource "docker_image" "opml" {
-  name          = "${data.docker_registry_image.opml.name}"
-  pull_triggers = ["${data.docker_registry_image.opml.sha256_digest}"]
+  resource {
+    memory = 256
+  }
 }
diff --git a/opml/redis.tf b/opml/redis.tf
index 15bf489..83b2363 100644
--- a/opml/redis.tf
+++ b/opml/redis.tf
@@ -1,22 +1,16 @@
-resource "docker_container" "redis" {
-  name  = "opml-redis"
-  image = "${docker_image.redis.latest}"
+module "redis" {
+  name     = "opml-redis"
+  source   = "../modules/container"
+  image    = "redis:alpine"
+  networks = ["${docker_network.opml.id}"]
 
-  volumes {
-    host_path      = "/mnt/xwing/cache/opml-redis"
-    container_path = "/data"
+  # ThisSucks
+  web {
+    expose = "false"
+    host   = ""
   }
 
-  memory                = 256
-  restart               = "unless-stopped"
-  destroy_grace_seconds = 10
-  must_run              = true
-
-  networks = ["${docker_network.opml.id}"]
-}
-
-resource "docker_image" "redis" {
-  name          = "${data.docker_registry_image.redis.name}"
-  pull_triggers = ["${data.docker_registry_image.redis.sha256_digest}"]
-  keep_locally  = true
+  resource {
+    memory = 256
+  }
 }
diff --git a/opml/variables.tf b/opml/variables.tf
index 91e8677..98f8d60 100644
--- a/opml/variables.tf
+++ b/opml/variables.tf
@@ -1,7 +1,3 @@
-variable "traefik-labels" {
-  type = "map"
-}
-
 variable "domain" {}
 variable "client-id" {}
 variable "client-secret" {}