diff --git a/jobs/socs/dcusr-listmonk.hcl b/jobs/socs/dcusr-listmonk.hcl
deleted file mode 100644
index 3f9ea7b..0000000
--- a/jobs/socs/dcusr-listmonk.hcl
+++ /dev/null
@@ -1,105 +0,0 @@
-job "dcusr-listmonk" {
-  datacenters = ["aperture"]
-  type        = "service"
-
-  meta {
-    domain = "lists.solarracing.ie"
-  }
-
-  group "listmonk" {
-    network {
-      port "http" {
-      }
-
-      port "db" {
-        to = 5432
-      }
-    }
-
-    service {
-      name = "listmonk"
-      port = "http"
-
-      check {
-        type     = "http"
-        path     = "/"
-        interval = "10s"
-        timeout  = "2s"
-      }
-
-      tags = [
-        "traefik.enable=true",
-        "traefik.port=${NOMAD_PORT_http}",
-        "traefik.http.routers.dcusr-listmonk.entrypoints=web,websecure",
-        "traefik.http.routers.dcusr-listmonk.rule=Host(`${NOMAD_META_domain}`)",
-        "traefik.http.routers.dcusr-listmonk.tls=true",
-        "traefik.http.routers.dcusr-listmonk.tls.certresolver=lets-encrypt",
-      ]
-    }
-
-    task "app" {
-      driver = "docker"
-
-      config {
-        image = "listmonk/listmonk:latest"
-        ports = ["http"]
-
-        entrypoint = ["./listmonk", "--static-dir=/listmonk/static"]
-
-        volumes = [
-          "/storage/nomad/dcusr-listmonk/static:/listmonk/static",
-          "/storage/nomad/dcusr-listmonk/postgres/:/var/lib/postgresql/data",
-          "local/config.toml:/listmonk/config.toml"
-        ]
-      }
-
-      resources {
-        cpu    = 1000
-        memory = 500
-      }
-
-      template {
-        data        = <<EOH
-[app]
-address = "0.0.0.0:{{ env "NOMAD_PORT_http" }}"
-
-# Database.
-[db]
-host = "{{ env "NOMAD_HOST_IP_db" }}"
-port = {{ env "NOMAD_HOST_PORT_db" }}
-user = "{{ key "dcusr/listmonk/db/username" }}"
-password = "{{ key "dcusr/listmonk/db/password" }}"
-database = "{{ key "dcusr/listmonk/db/name" }}"
-ssl_mode = "disable"
-max_open = 25
-max_idle = 25
-max_lifetime = "300s"
-EOH
-        destination = "local/config.toml"
-      }
-    }
-
-    task "listmonk-db" {
-      driver = "docker"
-
-      config {
-        image = "postgres:17-alpine"
-        ports = ["db"]
-
-        volumes = [
-          "/storage/nomad/dcusr-listmonk/postgres:/var/lib/postgresql/data"
-        ]
-      }
-
-      template {
-        data        = <<EOH
-POSTGRES_DB       = "{{ key "dcusr/listmonk/db/name" }}"
-POSTGRES_USER     = "{{ key "dcusr/listmonk/db/username" }}"
-POSTGRES_PASSWORD = "{{ key "dcusr/listmonk/db/password" }}"
-EOH
-        destination = "local/db.env"
-        env         = true
-      }
-    }
-  }
-}
diff --git a/jobs/socs/dcusr-pretix.hcl b/jobs/socs/dcusr-pretix.hcl
deleted file mode 100644
index 0186a0a..0000000
--- a/jobs/socs/dcusr-pretix.hcl
+++ /dev/null
@@ -1,137 +0,0 @@
-job "dcusr-pretix" {
-  datacenters = ["aperture"]
-
-  type = "service"
-
-  meta {
-    domain = "tickets.solarracing.ie"
-  }
-
-  group "web" {
-    network {
-      # mode = "bridge"
-      port "http" {
-        to = 80
-      }
-
-      port "db" {
-        to = 5432
-      }
-
-      port "redis" {
-        to = 6379
-      }
-    }
-
-    service {
-      name = "pretix-web"
-      port = "http"
-
-      tags = [
-        "traefik.enable=true",
-        "traefik.port=${NOMAD_PORT_http}",
-        "traefik.http.routers.pretix.entrypoints=web,websecure",
-        "traefik.http.routers.pretix.rule=Host(`${NOMAD_META_domain}`)",
-        "traefik.http.routers.pretix.tls=true",
-        "traefik.http.routers.pretix.tls.certresolver=lets-encrypt",
-      ]
-    }
-
-    task "pretix" {
-      driver = "docker"
-
-      config {
-        image = "pretix/standalone:stable"
-        ports = ["http"]
-
-        volumes = [
-          "local/pretix.cfg:/etc/pretix/pretix.cfg",
-          "/storage/nomad/pretix/data:/data",
-          "/etc/timezone:/etc/timezone:ro",
-        ]
-
-      }
-
-      resources {
-        memory = 5000
-        cores  = 1
-      }
-      env {
-        NUM_WORKERS = 1
-      }
-
-      template {
-        data        = <<EOH
-[pretix]
-instance_name=DCU Solar Racing
-url=https://{{ env "NOMAD_META_domain" }}
-currency=EUR
-datadir=/data
-registration=off
-
-[locale]
-timezone=Europe/Dublin
-
-[database]
-backend=postgresql
-name={{ key "pretix/db/name" }}
-user={{ key "pretix/db/user" }}
-password={{ key "pretix/db/password" }}
-host={{ env "NOMAD_IP_db" }}
-port={{ env "NOMAD_HOST_PORT_db" }}
-
-[mail]
-from={{ key "pretix/mail/from" }}
-host={{ key "pretix/mail/host" }}
-user={{ key "pretix/mail/user" }}
-password={{ key "pretix/mail/password" }}
-port=587
-tls=on
-ssl=off
-
-[redis]
-location=redis://{{ env "NOMAD_ADDR_redis" }}/0
-sessions=true
-
-[celery]
-backend=redis://{{ env "NOMAD_ADDR_redis" }}/1
-broker=redis://{{ env "NOMAD_ADDR_redis" }}/2
-worker_prefetch_multiplier = 0
-EOH
-        destination = "local/pretix.cfg"
-      }
-    }
-
-
-    task "pretix-db" {
-      driver = "docker"
-
-      config {
-        image = "postgres:16-alpine"
-        ports = ["db"]
-
-        volumes = [
-          "/storage/nomad/pretix/db:/var/lib/postgresql/data",
-        ]
-      }
-
-      template {
-        data        = <<EOH
-POSTGRES_USER={{ key "pretix/db/user" }}
-POSTGRES_PASSWORD={{ key "pretix/db/password" }}
-EOH
-        destination = "local/db.env"
-        env         = true
-      }
-    }
-
-    task "redis" {
-      driver = "docker"
-
-      config {
-        image = "redis:latest"
-        ports = ["redis"]
-      }
-    }
-  }
-}
diff --git a/jobs/socs/dcusr.hcl b/jobs/socs/dcusr.hcl
deleted file mode 100644
index 75b23be..0000000
--- a/jobs/socs/dcusr.hcl
+++ /dev/null
@@ -1,65 +0,0 @@
-job "dcusr" {
-  datacenters = ["aperture"]
-
-  type = "service"
-
-  group "dcusr" {
-    count = 1
-
-    network {
-      port "http" {
-        to = 3000
-      }
-    }
-
-    service {
-      name = "dcusr"
-      port = "http"
-
-      check {
-        type = "http"
-        path = "/"
-        interval = "10s"
-        timeout = "2s"
-      }
-
-      tags = [
-        "traefik.enable=true",
-        "traefik.http.routers.dcusr.rule=Host(`solarracing.rb.dcu.ie`) || Host(`solarracing.ie`) || Host(`www.solarracing.ie`)",
-        "traefik.http.routers.dcusr.entrypoints=web,websecure",
-        "traefik.http.routers.dcusr.tls.certresolver=lets-encrypt",
-      ]
-    }
-
-    task "nextjs-website" {
-      driver = "docker"
-
-      config {
-        image = "ghcr.io/dcu-solar-racing/nextjs-website:main"
-        ports = ["http"]
-        force_pull = true
-        auth {
-          username = "${DOCKER_USER}"
-          password = "${DOCKER_PASS}"
-        }
-      }
-      template {
-        destination = "secrets/secret.env"
-        env         = true
-        change_mode = "restart"
-        data        = <<EOH
-DOCKER_USER={{ key "dcusr/ghcr/username" }}
-DOCKER_PASS={{ key "dcusr/ghcr/password" }}
-TO_EMAIL={{ key "dcusr/nodemailer/to" }}
-EMAIL={{ key "dcusr/nodemailer/from" }}
-EMAIL_PASS={{ key "dcusr/nodemailer/password" }}
-LISTMONK_ENDPOINT={{ key "dcusr/listmonk/endpoint" }}
-LISTMONK_USERNAME={{ key "dcusr/listmonk/username" }}
-LISTMONK_PASSWORD={{ key "dcusr/listmonk/password" }}
-LISTMONK_LIST_IDS={{ key "dcusr/listmonk/list/id" }}
-RECAPTCHA_SECRET_KEY={{ key "dcusr/recaptcha/secret/key" }}
-EOH
-      }
-    }
-  }
-}
diff --git a/jobs/socs/dcusr/dcusr-grafana.hcl b/jobs/socs/dcusr/dcusr-grafana.hcl
new file mode 100644
index 0000000..d2e1210
--- /dev/null
+++ b/jobs/socs/dcusr/dcusr-grafana.hcl
@@ -0,0 +1,59 @@
+job "dcusr-grafana" {
+  datacenters = ["aperture"]
+  type        = "service"
+
+  meta {
+    domain = "dashboard.solarracing.ie"
+  }
+
+  group "grafana" {
+    network {
+      port "http" {
+        to = 3000
+      }
+    }
+
+    service {
+      name = "grafana"
+      port = "http"
+
+      tags = [
+        "traefik.enable=true",
+        "traefik.port=${NOMAD_PORT_http}",
+        "traefik.http.routers.grafana.entrypoints=web,websecure",
+        "traefik.http.routers.grafana.rule=Host(`${NOMAD_META_domain}`)",
+        "traefik.http.routers.grafana.tls=true",
+        "traefik.http.routers.grafana.tls.certresolver=lets-encrypt",
+      ]
+    }
+
+    task "grafana" {
+      driver = "docker"
+
+      config {
+        image = "grafana/grafana"
+        ports = ["http"]
+
+        volumes = [
+          "/storage/nomad/${NOMAD_JOB_NAME}/${NOMAD_TASK_NAME}/data:/var/lib/grafana",
+          "/storage/nomad/${NOMAD_JOB_NAME}/${NOMAD_TASK_NAME}/plugins:/var/lib/grafana/plugins"
+        ]
+      }
+
+      template {
+        data        = <<EOH
+GF_PLUGINS_PREINSTALL=grafana-clock-panel
+GF_USERS_ALLOW_SIGN_UP=false
+EOH
+        destination = "local/.env"
+        env         = true
+      }
+
+      resources {
+        cpu    = 1000
+        memory = 1000
+      }
+    }
+  }
+}
+
diff --git a/jobs/socs/dcusr/dcusr-listmonk.hcl b/jobs/socs/dcusr/dcusr-listmonk.hcl
new file mode 100644
index 0000000..ad42e5a
--- /dev/null
+++ b/jobs/socs/dcusr/dcusr-listmonk.hcl
@@ -0,0 +1,178 @@
+job "dcusr-listmonk" {
+  datacenters = ["aperture"]
+  type        = "service"
+
+  meta {
+    domain = "lists.solarracing.ie"
+  }
+
+  group "listmonk" {
+    network {
+      port "http" {
+      }
+    }
+
+    update {
+      max_parallel     = 1
+      health_check     = "checks"
+      min_healthy_time = "10s"
+      healthy_deadline = "5m"
+    }
+
+
+    service {
+      name = "dcusr-listmonk"
+      port = "http"
+
+      check {
+        type     = "http"
+        path     = "/"
+        interval = "10s"
+        timeout  = "2s"
+      }
+
+      tags = [
+        "traefik.enable=true",
+        "traefik.port=${NOMAD_PORT_http}",
+        "traefik.http.routers.dcusr-listmonk.entrypoints=web,websecure",
+        "traefik.http.routers.dcusr-listmonk.rule=Host(`${NOMAD_META_domain}`)",
+        "traefik.http.routers.dcusr-listmonk.tls=true",
+        "traefik.http.routers.dcusr-listmonk.tls.certresolver=lets-encrypt",
+      ]
+    }
+
+    task "app" {
+      driver = "docker"
+
+      config {
+        image = "listmonk/listmonk:latest"
+        ports = ["http"]
+
+        command = "sh"
+        args    = ["-c", "./listmonk --install --idempotent --yes --config '' && ./listmonk --upgrade --yes --config '' && ./listmonk --config ''"] # empty config so envvars are used instead
+
+        volumes = [
+          "/storage/nomad/${NOMAD_JOB_NAME}/${NOMAD_TASK_NAME}/uploads:/uploads",
+        ]
+      }
+
+      resources {
+        cpu    = 1000
+        memory = 500
+      }
+
+      template {
+        destination = "local/.env"
+        env         = true
+        data        = <<EOH
+LISTMONK_app__address     = 0.0.0.0:{{ env "NOMAD_PORT_http" }}
+LISTMONK_app__public_url  = {{ env "NOMAD_META_domain" }}
+
+LISTMONK_db__user         = {{ key "dcusr/listmonk/db/username" }}
+LISTMONK_db__password     = {{ key "dcusr/listmonk/db/password" }}
+LISTMONK_db__database     = {{ key "dcusr/listmonk/db/name" }}
+{{- range service "dcusr-listmonk-db" }}
+LISTMONK_db__host         = {{ .Address }}
+LISTMONK_db__port         = {{ .Port }}
+{{- end }}
+LISTMONK_db__ssl_mode     = disable
+LISTMONK_db__max_open     = 25
+LISTMONK_db__max_idle     = 25
+LISTMONK_db__max_lifetime = 300s
+TZ                        = Etc/UTC
+LISTMONK_ADMIN_USER       = {{ key "dcusr/listmonk/admin/username" }}
+LISTMONK_ADMIN_PASSWORD   = {{ key "dcusr/listmonk/admin/password" }}
+EOH
+      }
+    }
+
+    task "wait-for-db" {
+      driver = "docker"
+
+      lifecycle {
+        hook    = "prestart"
+        sidecar = false
+      }
+
+      config {
+        image   = "postgres:17-alpine"
+        command = "sh"
+        args = [
+          "-c",
+          "while ! pg_isready -h ${DB_HOST} -p ${DB_PORT} -U ${DB_USER}; do echo 'Waiting for DB...'; sleep 1; done; echo 'DB is ready!'"
+        ]
+      }
+
+      template {
+        destination = "local/wait.env"
+        env         = true
+        data        = <<EOH
+{{- range service "dcusr-listmonk-db" }}
+DB_HOST={{ .Address }}
+DB_PORT={{ .Port }}
+{{- end }}
+DB_USER={{ key "dcusr/listmonk/db/username" }}
+EOH
+      }
+
+      resources {
+        memory = 128
+      }
+    }
+
+  }
+  group "database" {
+    count = 1
+
+    network {
+      port "db" {
+        to = 5432
+      }
+    }
+
+    update {
+      max_parallel = 0 # don't update this group automatically
+      auto_revert  = false
+    }
+
+    task "postgres" {
+      driver         = "docker"
+      kill_signal    = "SIGTERM" # SIGTERM instead of SIGKILL so database can shutdown safely
+      kill_timeout   = "30s"
+      shutdown_delay = "5s"
+
+      service {
+        name = "dcusr-listmonk-db"
+        port = "db"
+
+        check {
+          type     = "script"
+          name     = "postgres-ready"
+          command  = "/bin/sh"
+          args     = ["-c", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
+          interval = "10s"
+          timeout  = "2s"
+        }
+      }
+
+      config {
+        image = "postgres:17-alpine"
+        ports = ["db"]
+
+        volumes = [
+          "/storage/nomad/${NOMAD_JOB_NAME}/${NOMAD_TASK_NAME}:/var/lib/postgresql/data"
+        ]
+      }
+
+      template {
+        data        = <<EOH
+POSTGRES_DB       = "{{ key "dcusr/listmonk/db/name" }}"
+POSTGRES_USER     = "{{ key "dcusr/listmonk/db/username" }}"
+POSTGRES_PASSWORD = "{{ key "dcusr/listmonk/db/password" }}"
+EOH
+        destination = "local/db.env"
+        env         = true
+      }
+    }
+  }
+}
diff --git a/jobs/socs/dcusr/dcusr-openproject-backup.hcl b/jobs/socs/dcusr/dcusr-openproject-backup.hcl
new file mode 100644
index 0000000..b7af4b7
--- /dev/null
+++ b/jobs/socs/dcusr/dcusr-openproject-backup.hcl
@@ -0,0 +1,133 @@
+job "dcusr-openproject-backup" {
+  datacenters = ["aperture"]
+  type        = "batch"
+
+  periodic {
+    crons            = ["0 */3 * * * *"]
+    prohibit_overlap = true
+  }
+
+  group "db-backup" {
+    task "openproject-backup" {
+      driver = "raw_exec"
+
+      config {
+        command = "/bin/bash"
+        args    = ["local/script.sh"]
+      }
+
+      template {
+        destination = "local/script.sh"
+        data        = <<EOH
+#!/bin/bash
+set -e
+
+BACKUP_BASE="/storage/backups/nomad/openproject/dcusr"
+mkdir -p "${BACKUP_BASE}"
+
+job_name=$(echo ${NOMAD_JOB_NAME} | cut -d "/" -f 1)
+timestamp="$(TZ=Europe/Dublin date '+%Y-%m-%d_%H-%M-%S')"
+outfile="${BACKUP_BASE}/openproject-${timestamp}.zip"
+
+if [ -z "${OPENPROJECT_DOMAIN}" ] || [ -z "${OPENPROJECT_API_KEY}" ] || [ -z "${OPENPROJECT_BACKUP_TOKEN}" ]; then
+  echo "Missing required Consul keys (OPENPROJECT_DOMAIN / OPENPROJECT_API_KEY / OPENPROJECT_BACKUP_TOKEN)."
+  exit 1
+fi
+
+curl -s -X POST -u "apikey:${OPENPROJECT_API_KEY}" \
+  "https://${OPENPROJECT_DOMAIN}/api/v3/backups" \
+  -H 'content-type: application/json' \
+  --data-raw "{\"backupToken\":\"${OPENPROJECT_BACKUP_TOKEN}\",\"attachments\":true}" \
+  > /tmp/op_backup_response.json || {
+    echo "Failed to POST backup creation"
+    exit 1
+  }
+
+status_path="$(jq -r ._links.job_status.href < /tmp/op_backup_response.json 2>/dev/null || true)"
+if [ -z "${status_path}" ] || [ "${status_path}" = "null" ]; then
+  echo "Could not obtain job_status link from API response"
+  cat /tmp/op_backup_response.json || true
+  exit 1
+fi
+
+status_url="https://${OPENPROJECT_DOMAIN}${status_path}"
+
+while true; do
+  curl -s -u "apikey:${OPENPROJECT_API_KEY}" "${status_url}" > /tmp/op_status.json || {
+    echo "Failed to fetch status from ${status_url}"
+    sleep 5
+    continue
+  }
+
+  status="$(jq -r .status < /tmp/op_status.json 2>/dev/null || true)"
+  if [ "${status}" = "success" ]; then
+    echo "Backup ready for download"
+    break
+  fi
+
+  if [ "${status}" = "failed" ] || [ "${status}" = "error" ]; then
+    echo "Backup job failed (status=${status})"
+    cat /tmp/op_status.json || true
+    if [ -n "${DISCORD_WEBHOOK}" ]; then
+      curl -s -H "Content-Type: application/json" -d \
+        "{\"content\": \"<@&585512338728419341> \`OpenProject\` backup for **${job_name}** has **FAILED**. Status: ${status}. Date: $(TZ=Europe/Dublin date)\"}" \
+        "${DISCORD_WEBHOOK}" || true
+    fi
+    exit 2
+  fi
+
+  echo "waiting for backup generation (current status=${status})"
+  sleep 5
+done
+
+download_path="$(jq -r .payload.download < /tmp/op_status.json 2>/dev/null || true)"
+if [ -z "${download_path}" ] || [ "${download_path}" = "null" ]; then
+  echo "No download path found in status payload"
+  exit 1
+fi
+
+download_url="https://${OPENPROJECT_DOMAIN}${download_path}"
+
+curl -s -u "apikey:${OPENPROJECT_API_KEY}" -L "${download_url}" -o "${outfile}" || {
+  echo "Failed to download backup to ${outfile}"
+  [ -f "${outfile}" ] && rm -f "${outfile}"
+  exit 1
+}
+
+if [ -s "${outfile}" ]; then
+  echo "Backup successful: ${outfile}"
+else
+  echo "Downloaded file is empty or missing: ${outfile}"
+  rm -f "${outfile}" || true
+  if [ -n "${DISCORD_WEBHOOK}" ]; then
+    curl -s -H "Content-Type: application/json" -d \
+      "{\"content\": \"<@&585512338728419341> \`OpenProject\` backup for **${job_name}** has just **FAILED** (empty file). File: ${outfile} Date: $(TZ=Europe/Dublin date)\"}" \
+      "${DISCORD_WEBHOOK}" || true
+  fi
+  exit 1
+fi
+
+find "${BACKUP_BASE}" -name 'openproject-*.zip' -ctime +3 -exec rm {} \; || true
+
+exit 0
+EOH
+      }
+
+      template {
+        destination = "local/consul_env"
+        env         = true
+        data        = <<EOH
+OPENPROJECT_DOMAIN={{ key "dcusr/openproject/domain" }}
+OPENPROJECT_API_KEY={{ key "dcusr/openproject/api/key" }}
+OPENPROJECT_BACKUP_TOKEN={{ key "dcusr/openproject/backup/token" }}
+DISCORD_WEBHOOK={{ key "dcusr/postgres/webhook/discord" }}
+EOH
+      }
+
+      resources {
+        cpu    = 200
+        memory = 256
+      }
+    }
+  }
+}
diff --git a/jobs/socs/dcusr/dcusr-openproject.hcl b/jobs/socs/dcusr/dcusr-openproject.hcl
new file mode 100644
index 0000000..364596f
--- /dev/null
+++ b/jobs/socs/dcusr/dcusr-openproject.hcl
@@ -0,0 +1,79 @@
+job "dcusr-openproject" {
+  datacenters = ["aperture"]
+  type        = "service"
+
+  meta {
+    domain = "projects.solarracing.ie"
+  }
+
+  group "openproject" {
+    count = 1
+
+    network {
+      port "http" { 
+        to = 80 
+      }
+    }
+
+    restart {
+      attempts = 20
+      delay    = "10s"
+      interval = "10m"
+      mode     = "delay"
+    }
+
+    service {
+      name     = "openproject"
+      port     = "http"
+
+      tags = [
+        "traefik.enable=true",
+        "traefik.port=${NOMAD_PORT_http}",
+        "traefik.http.routers.dcusr-openproject.entrypoints=web,websecure",
+        "traefik.http.routers.dcusr-openproject.rule=Host(`${NOMAD_META_domain}`)",
+        "traefik.http.routers.dcusr-openproject.tls=true",
+      ]
+    }
+
+    task "openproject-aio" {
+      driver = "docker"
+
+      config {
+        image = "openproject/openproject:17"
+        ports = ["http"]
+        volumes = [
+          "/storage/nomad/${NOMAD_JOB_NAME}/pgdata:/var/openproject/pgdata",
+          "/storage/nomad/${NOMAD_JOB_NAME}/assets:/var/openproject/assets",
+        ]
+      }
+
+      template {
+        destination = "local/app.env"
+        env         = true
+        data = <<EOH
+OPENPROJECT_HOST__NAME={{ env "NOMAD_META_domain" }}
+OPENPROJECT_HTTPS=true
+
+OPENPROJECT_SECRET_KEY_BASE={{ key "dcusr/openproject/secret_key_base" }}
+SECRET_KEY_BASE={{ key "dcusr/openproject/secret_key_base" }}
+
+EMAIL_DELIVERY_METHOD=smtp
+SMTP_ADDRESS={{ key "dcusr/openproject/smtp/address" }}
+SMTP_PORT={{ key "dcusr/openproject/smtp/port" }}
+SMTP_DOMAIN={{ key "dcusr/openproject/smtp/domain" }}
+SMTP_AUTHENTICATION={{ key "dcusr/openproject/smtp/auth" }}
+SMTP_USER_NAME={{ key "dcusr/openproject/smtp/username" }}
+SMTP_PASSWORD={{ key "dcusr/openproject/smtp/password" }}
+SMTP_ENABLE_STARTTLS_AUTO=true
+
+EOH
+      }
+
+      resources {
+        cpu    = 1500
+        memory = 8192
+      }
+    }
+  }
+}
+
diff --git a/jobs/socs/dcusr-outline-backup.hcl b/jobs/socs/dcusr/dcusr-outline-backup.hcl
similarity index 100%
rename from jobs/socs/dcusr-outline-backup.hcl
rename to jobs/socs/dcusr/dcusr-outline-backup.hcl
diff --git a/jobs/socs/dcusr-outline.hcl b/jobs/socs/dcusr/dcusr-outline.hcl
similarity index 98%
rename from jobs/socs/dcusr-outline.hcl
rename to jobs/socs/dcusr/dcusr-outline.hcl
index 5cf438e..89d9f67 100644
--- a/jobs/socs/dcusr-outline.hcl
+++ b/jobs/socs/dcusr/dcusr-outline.hcl
@@ -10,8 +10,7 @@ job "dcusr-outline" {
     network {
       # mode = "bridge"
       port "http" {
-        static = 3000
-        to     = 3000
+        to = 3000
       }
 
       port "db" {
diff --git a/jobs/socs/dcusr/dcusr.hcl b/jobs/socs/dcusr/dcusr.hcl
new file mode 100644
index 0000000..04774dc
--- /dev/null
+++ b/jobs/socs/dcusr/dcusr.hcl
@@ -0,0 +1,207 @@
+job "dcusr-dev" {
+  datacenters = ["aperture"]
+  type        = "service"
+
+  meta {
+    domain  = "solarracing.ie"
+    domain2 = "www.solarracing.ie"
+  }
+
+  group "web" {
+    count = 1
+
+    network {
+      port "http" {
+        to = 3000
+      }
+    }
+
+    update {
+      max_parallel     = 1
+      health_check     = "checks"
+      min_healthy_time = "10s"
+      healthy_deadline = "5m"
+    }
+
+
+    service {
+      name = "dcusr"
+      port = "http"
+
+      check {
+        type     = "http"
+        path     = "/"
+        interval = "30s"
+        timeout  = "2s"
+      }
+
+
+      tags = [
+        "traefik.enable=true",
+        "traefik.http.routers.dcusr-dev.rule=Host(`${NOMAD_META_domain}`) || Host(`${NOMAD_META_domain2}`)",
+        "traefik.http.routers.dcusr-dev.entrypoints=web,websecure",
+        "traefik.http.routers.dcusr-dev.tls.certresolver=lets-encrypt",
+
+      ]
+    }
+
+    task "nextjs-website" {
+      driver = "docker"
+
+      config {
+        image      = "ghcr.io/dcu-solar-racing/website:main"
+        ports      = ["http"]
+        force_pull = true
+
+        auth {
+          username = "${DOCKER_USER}"
+          password = "${DOCKER_PASS}"
+        }
+      }
+      template {
+        destination = "local/.env"
+        env         = true
+        data        = <<EOH
+DOCKER_USER={{ key "dcusr/ghcr/username" }}
+DOCKER_PASS={{ key "dcusr/ghcr/password" }}
+
+NEXT_PUBLIC_SITE_URL=https://{{ env "NOMAD_META_domain" }}
+
+AUTH_URL=https://{{ env "NOMAD_META_domain" }}
+AUTH_TRUST_HOST=true
+AUTH_SECRET={{ key "socs/dcusr-dev/auth/secret" }}
+
+NEXTAUTH_URL=https://{{ env "NOMAD_META_domain" }}
+NEXTAUTH_SECRET={{ key "socs/dcusr-dev/auth/secret" }}
+
+PREVIEW_SECRET={{ key "socs/dcusr-dev/preview/secret" }}
+
+SEED_ADMIN_EMAIL={{ key "socs/dcusr-dev/seed/email" }}
+SEED_ADMIN_PASSWORD={{ key "socs/dcusr-dev/seed/password" }}
+
+{{ range service "dcusr-dev-db"  -}}
+DATABASE_URL=postgresql://{{ key "socs/dcusr-dev/db/user" | urlquery }}:{{ key "socs/dcusr-dev/db/password" | urlquery }}@{{ .Address }}:{{ .Port }}/{{ key "socs/dcusr-dev/db/name" | urlquery }}?schema=public
+{{- end }}
+
+MINIO_ENDPOINT={{ key "socs/dcusr-dev/minio/url" }}
+MINIO_PORT={{ key "socs/dcusr-dev/minio/port" }}
+MINIO_ACCESS_KEY="{{ key "socs/dcusr-dev/minio/access/key" }}"
+MINIO_SECRET_KEY="{{ key "socs/dcusr-dev/minio/secret/key" }}"
+MINIO_BUCKET={{ key "socs/dcusr-dev/minio/bucket" }}
+MINIO_USE_SSL=true
+MINIO_PUBLIC_BASE_URL={{ key "socs/dcusr-dev/minio/base/url" }}
+MINIO_FORCE_PATH_STYLE=true
+MINIO_PUBLIC_URL={{ key "socs/dcusr-dev/minio/public/url" }}
+MINIO_REGION=ie-redbrick
+
+SMTP_HOST=smtp.gmail.com
+SMTP_PORT=465
+SMTP_USER={{ key "socs/dcusr-dev/smtp/user" }}
+SMTP_PASS={{ key "socs/dcusr-dev/smtp/password" }}
+MAIL_FROM={{ key "socs/dcusr-dev/mail/from" }}
+MAIL_TO={{ key "socs/dcusr-dev/mail/to" }}
+SMTP_SECURE=true
+SMTP_REJECT=true
+
+MAIL_BRAND="DCU Solar Racing"
+MAIL_PRIMARY="#22c55e"
+
+PLAUSIBLE_BASE_URL={{ key "socs/dcusr-dev/plausible/url" }}
+
+NEXT_PUBLIC_RECAPTCHA_SITE_KEY={{ key "socs/dcusr/captcha/site/key"}}
+RECAPTCHA_SECRET={{ key "socs/dcusr/captcha/secret/key" }}
+EOH
+      }
+    }
+
+    task "wait-for-db" {
+      driver = "docker"
+
+      lifecycle {
+        hook    = "prestart"
+        sidecar = false
+      }
+      config {
+        image   = "alpine:3.19"
+        command = "sh"
+        args = [
+          "-c",
+          "while ! nc -z \"$DB_HOST\" \"$DB_PORT\"; do echo 'Waiting for Postgres...'; sleep 1; done; echo 'DB is ready!'"
+        ]
+      }
+
+      template {
+        destination = "local/.env"
+        env         = true
+        change_mode = "restart"
+        data        = <<EOH
+{{- range service "dcusr-dev-db" }}
+DB_HOST={{ .Address }}
+DB_PORT={{ .Port }}
+{{- end }}
+EOH
+      }
+
+      resources {
+        cpu    = 50
+        memory = 64
+      }
+    }
+  }
+
+  group "database" {
+    count = 1
+
+    network {
+      port "db" {
+        to = 5432
+      }
+    }
+
+    update {
+      max_parallel = 0 # don't update this group automatically
+      auto_revert  = false
+    }
+
+    task "db" {
+      driver         = "docker"
+      kill_signal    = "SIGTERM" # SIGTERM instead of SIGKILL so database can shutdown safely
+      kill_timeout   = "30s"
+      shutdown_delay = "5s"
+
+      service {
+        name = "dcusr-dev-db"
+        port = "db"
+
+        check {
+          type     = "script"
+          name     = "postgres-ready"
+          command  = "/bin/sh"
+          args     = ["-c", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
+          interval = "10s"
+          timeout  = "2s"
+        }
+      }
+
+
+      config {
+        image = "postgres:17-alpine"
+        ports = ["db"]
+
+        volumes = [
+          "/storage/nomad/${NOMAD_JOB_NAME}/${NOMAD_TASK_NAME}:/var/lib/postgresql/data",
+        ]
+      }
+
+      template {
+        destination = "local/.env"
+        env         = true
+        data        = <<EOH
+POSTGRES_DB={{ key "socs/dcusr-dev/db/name" }}
+POSTGRES_USER={{ key "socs/dcusr-dev/db/user" }}
+POSTGRES_PASSWORD={{ key "socs/dcusr-dev/db/password" }}
+EOH
+      }
+    }
+  }
+}
diff --git a/jobs/socs/dcusr/pitwall.hcl b/jobs/socs/dcusr/pitwall.hcl
new file mode 100644
index 0000000..2b77f84
--- /dev/null
+++ b/jobs/socs/dcusr/pitwall.hcl
@@ -0,0 +1,69 @@
+job "pitwall" {
+  datacenters = ["aperture"]
+  type        = "service"
+
+  meta {
+    domain = "pitwall.solarracing.ie"
+  }
+
+  group "pitwall" {
+    count          = 1
+    shutdown_delay = "5s"
+
+    network {
+      port "http" {
+        to = 8080
+      }
+    }
+
+    service {
+      name = "pitwall"
+      port = "http"
+
+      check {
+        type     = "http"
+        path     = "/healthz"
+        interval = "10s"
+        timeout  = "2s"
+      }
+
+      tags = [
+        "traefik.enable=true",
+        "traefik.http.routers.pitwall.rule=Host(`${NOMAD_META_domain}`)",
+        "traefik.http.routers.pitwall.entrypoints=web,websecure",
+        "traefik.http.routers.dcusr-dev.tls=true",
+      ]
+    }
+
+    task "pitwall-dashboard" {
+      driver = "docker"
+
+      config {
+        image      = "ghcr.io/dcu-solar-racing/solarcar-ecs-pit-dashboard:latest"
+        ports      = ["http"]
+        force_pull = true
+
+        auth {
+          username = "${DOCKER_USER}"
+          password = "${DOCKER_PASS}"
+        }
+      }
+
+      template {
+        destination = "secrets/secret.env"
+        env         = true
+        change_mode = "restart"
+        data        = <<EOH
+DOCKER_USER={{ key "dcusr/ghcr/username" }}
+DOCKER_PASS={{ key "dcusr/ghcr/password" }}
+EOH
+      }
+
+      resources {
+        cpu    = 100
+        memory = 64
+      }
+    }
+  }
+}
+