diff --git a/databases/main.tf b/databases/main.tf
index eb03061..306389e 100644
--- a/databases/main.tf
+++ b/databases/main.tf
@@ -36,11 +36,3 @@ resource "nomad_job" "redis" {
   # Block until deployed as there are servics dependent on this one
   detach = false
 }
-
-resource "nomad_job" "rediscommander" {
-  hcl2 {
-    enabled = true
-  }
-
-  jobspec = file("${path.module}/rediscommander.nomad")
-}
diff --git a/databases/rediscommander.nomad b/databases/rediscommander.nomad
deleted file mode 100644
index a3a456d..0000000
--- a/databases/rediscommander.nomad
+++ /dev/null
@@ -1,99 +0,0 @@
-job "rediscommander" {
-  datacenters = ["dc1"]
-  type = "service"
-
-  group "rediscommander" {
-    count = 1
-
-    network {
-      mode = "bridge"
-
-      port "main" {
-        host_network = "wesher"
-        to = 8081
-      }
-    }
-
-    service {
-      name = "rediscommander"
-      provider = "nomad"
-      port = "main"
-
-      tags = [
-        "traefik.enable=true",
-        "traefik.http.routers.rediscommander.entryPoints=websecure",
-      ]
-    }
-
-    task "rediscommander" {
-      driver = "docker"
-
-      config {
-        image = "rediscommander/redis-commander:latest"
-        ports = ["main"]
-      }
-
-      template {
-        data = <<EOH
-        REDIS_HOSTS=stunnel:127.0.0.1:6379
-        EOH
-        env = true
-        destination = "env"
-      }
-
-      resources {
-        cpu = 50
-        memory = 50
-      }
-    }
-
-    task "redis-stunnel" {
-      driver = "docker"
-
-      config {
-        image = "alpine:3.17"
-        args = ["/bin/sh", "${NOMAD_TASK_DIR}/start.sh"]
-      }
-
-      resources {
-        cpu = 100
-        memory = 100
-      }
-
-      template {
-        data = <<EOF
-set -e
-apk add stunnel
-exec stunnel {{ env "NOMAD_TASK_DIR" }}/stunnel.conf
-        EOF
-        destination = "${NOMAD_TASK_DIR}/start.sh"
-      }
-
-      template {
-        data = <<EOF
-syslog = no
-foreground = yes
-delay = yes
-
-[redis_client]
-client = yes
-accept = 127.0.0.1:6379
-{{ range nomadService 1 (env "NOMAD_ALLOC_ID") "redis-tls" -}}
-connect = {{ .Address }}:{{ .Port }}
-{{- end }}
-PSKsecrets = {{ env "NOMAD_SECRETS_DIR" }}/stunnel_psk.txt
-        EOF
-        destination = "${NOMAD_TASK_DIR}/stunnel.conf"
-      }
-
-      template {
-        data = <<EOF
-{{ with nomadVar "nomad/jobs/rediscommander" -}}
-{{ .redis_stunnel_psk }}
-{{- end }}
-        EOF
-        destination = "${NOMAD_SECRETS_DIR}/stunnel_psk.txt"
-      }
-    }
-  }
-}
diff --git a/services/rediscommander.tf b/services/rediscommander.tf
new file mode 100644
index 0000000..785ebe1
--- /dev/null
+++ b/services/rediscommander.tf
@@ -0,0 +1,16 @@
+# module "rediscommander" {
+#   source = "./service"
+#
+#   name  = "rediscommander"
+#   image = "rediscommander/redis-commander:latest"
+#
+#   ingress      = true
+#   service_port = 8081
+#
+#   use_redis    = true
+#
+#   resources = {
+#     cpu    = 50
+#     memory = 50
+#   }
+# }