diff --git a/jobs/nginx/atlas.hcl b/jobs/nginx/atlas.hcl
index 0f1b5a7..81c334c 100644
--- a/jobs/nginx/atlas.hcl
+++ b/jobs/nginx/atlas.hcl
@@ -1,6 +1,6 @@
 job "atlas" {
   datacenters = ["aperture"]
-  type = "service"
+  type        = "service"
 
   meta {
     git-sha = ""
@@ -19,10 +19,10 @@ job "atlas" {
       port = "http"
 
       check {
-        type = "http"
-        path = "/"
+        type     = "http"
+        path     = "/"
         interval = "10s"
-        timeout = "2s"
+        timeout  = "2s"
       }
 
       tags = [
@@ -40,8 +40,9 @@ job "atlas" {
       driver = "docker"
 
       config {
-        image = "ghcr.io/redbrick/atlas:latest"
-        ports = ["http"]
+        image      = "ghcr.io/redbrick/atlas:latest"
+        ports      = ["http"]
+        force_pull = true
       }
 
       resources {
diff --git a/jobs/nginx/cawnj-test.hcl b/jobs/nginx/cawnj-test.hcl
index 19ae525..22d7f55 100644
--- a/jobs/nginx/cawnj-test.hcl
+++ b/jobs/nginx/cawnj-test.hcl
@@ -20,10 +20,10 @@ job "cawnj-test" {
       port = "http"
 
       check {
-        type = "http"
-        path = "/"
+        type     = "http"
+        path     = "/"
         interval = "10s"
-        timeout = "2s"
+        timeout  = "2s"
       }
       tags = [
         "traefik.enable=true",
diff --git a/jobs/nginx/karting.hcl b/jobs/nginx/karting.hcl
index b861f5a..49b100c 100644
--- a/jobs/nginx/karting.hcl
+++ b/jobs/nginx/karting.hcl
@@ -20,10 +20,10 @@ job "nginx-karting" {
       port = "http"
 
       check {
-        type = "http"
-        path = "/"
+        type     = "http"
+        path     = "/"
         interval = "10s"
-        timeout = "2s"
+        timeout  = "2s"
       }
       tags = [
         "traefik.enable=true",
diff --git a/jobs/nginx/nginx.hcl b/jobs/nginx/nginx.hcl
index e0f59ce..2e08977 100644
--- a/jobs/nginx/nginx.hcl
+++ b/jobs/nginx/nginx.hcl
@@ -5,7 +5,7 @@ job "nginx" {
 
   group "aperture" {
     count = 3
-    
+
     network {
       port "http" {
         to = "80"
@@ -20,14 +20,14 @@ job "nginx" {
       port = "http"
 
       check {
-        type = "http"
-        path = "/"
+        type     = "http"
+        path     = "/"
         interval = "10s"
-        timeout = "2s"
-      } 
+        timeout  = "2s"
+      }
       tags = [
         "traefik.enable=true",
-        "traefik.http.routers.nginx-aperture.rule=Host(`aperture.redbrick.dcu.ie`)",   
+        "traefik.http.routers.nginx-aperture.rule=Host(`aperture.redbrick.dcu.ie`)",
         "traefik.http.routers.nginx-aperture.entrypoints=web,websecure",
         "traefik.http.routers.nginx-aperture.tls.certresolver=lets-encrypt"
       ]
@@ -49,7 +49,7 @@ job "nginx" {
       }
 
       template {
-        source = "local/index.html"
+        source      = "local/index.html"
         destination = "local/index.html"
       }
     }
@@ -57,7 +57,7 @@ job "nginx" {
 
   group "glados" {
     count = 1
-    
+
     network {
       port "http" {
         to = "80"
@@ -72,14 +72,14 @@ job "nginx" {
       port = "http"
 
       check {
-        type = "http"
-        path = "/"
+        type     = "http"
+        path     = "/"
         interval = "10s"
-        timeout = "2s"
-      } 
+        timeout  = "2s"
+      }
       tags = [
         "traefik.enable=true",
-        "traefik.http.routers.nginx-glados.rule=Host(`glados.redbrick.dcu.ie`)",   
+        "traefik.http.routers.nginx-glados.rule=Host(`glados.redbrick.dcu.ie`)",
         "traefik.http.routers.nginx-glados.entrypoints=web,websecure",
         "traefik.http.routers.nginx-glados.tls.certresolver=lets-encrypt"
       ]
@@ -88,7 +88,7 @@ job "nginx" {
     task "glados" {
       constraint {
         attribute = "${attr.unique.hostname}"
-        value = "glados"
+        value     = "glados"
       }
       driver = "docker"
 
@@ -105,7 +105,7 @@ job "nginx" {
       }
 
       template {
-        source = "local/glados.html"
+        source      = "local/glados.html"
         destination = "local/index.html"
       }
     }
@@ -113,7 +113,7 @@ job "nginx" {
 
   group "wheatley" {
     count = 1
-    
+
     network {
       port "http" {
         to = "80"
@@ -128,14 +128,14 @@ job "nginx" {
       port = "http"
 
       check {
-        type = "http"
-        path = "/"
+        type     = "http"
+        path     = "/"
         interval = "10s"
-        timeout = "2s"
-      } 
+        timeout  = "2s"
+      }
       tags = [
         "traefik.enable=true",
-        "traefik.http.routers.nginx-wheatley.rule=Host(`wheatley.redbrick.dcu.ie`)",   
+        "traefik.http.routers.nginx-wheatley.rule=Host(`wheatley.redbrick.dcu.ie`)",
         "traefik.http.routers.nginx-wheatley.entrypoints=web,websecure",
         "traefik.http.routers.nginx-wheatley.tls.certresolver=lets-encrypt"
       ]
@@ -144,7 +144,7 @@ job "nginx" {
     task "wheatley" {
       constraint {
         attribute = "${attr.unique.hostname}"
-        value = "wheatley"
+        value     = "wheatley"
       }
 
       driver = "docker"
@@ -162,7 +162,7 @@ job "nginx" {
       }
 
       template {
-        source = "local/wheatley.html"
+        source      = "local/wheatley.html"
         destination = "local/index.html"
       }
     }
@@ -170,7 +170,7 @@ job "nginx" {
 
   group "chell" {
     count = 1
-    
+
     network {
       port "http" {
         to = "80"
@@ -185,14 +185,14 @@ job "nginx" {
       port = "http"
 
       check {
-        type = "http"
-        path = "/"
+        type     = "http"
+        path     = "/"
         interval = "10s"
-        timeout = "2s"
-      } 
+        timeout  = "2s"
+      }
       tags = [
         "traefik.enable=true",
-        "traefik.http.routers.nginx-chell.rule=Host(`chell.redbrick.dcu.ie`)",   
+        "traefik.http.routers.nginx-chell.rule=Host(`chell.redbrick.dcu.ie`)",
         "traefik.http.routers.nginx-chell.entrypoints=web,websecure",
         "traefik.http.routers.nginx-chell.tls.certresolver=lets-encrypt"
       ]
@@ -201,7 +201,7 @@ job "nginx" {
     task "chell" {
       constraint {
         attribute = "${attr.unique.hostname}"
-        value = "chell"
+        value     = "chell"
       }
 
       driver = "docker"
@@ -219,7 +219,7 @@ job "nginx" {
       }
 
       template {
-        source = "local/chell.html"
+        source      = "local/chell.html"
         destination = "local/index.html"
       }
     }
diff --git a/jobs/services/api.hcl b/jobs/services/api.hcl
index 4cdaf37..23d1b8c 100644
--- a/jobs/services/api.hcl
+++ b/jobs/services/api.hcl
@@ -17,10 +17,10 @@ job "api" {
       port = "http"
 
       check {
-        type = "http"
-        path = "/"
+        type     = "http"
+        path     = "/"
         interval = "10s"
-        timeout = "2s"
+        timeout  = "2s"
       }
 
       tags = [
@@ -68,14 +68,14 @@ EMAIL_SENDER={{ key "api/smtp/sender" }}
 EOH
       }
 
-    template {
+      template {
         destination = "local/ldap.secret"
         perms       = "600"
-        data = "{{ key \"api/ldap/secret\" }}" # this is necessary as the secret has no EOF
+        data        = "{{ key \"api/ldap/secret\" }}" # this is necessary as the secret has no EOF
       }
 
       resources {
-        cpu = 300
+        cpu    = 300
         memory = 1024
       }
     }
diff --git a/jobs/services/brickbot.hcl b/jobs/services/brickbot.hcl
index 87a0e55..8c480f9 100644
--- a/jobs/services/brickbot.hcl
+++ b/jobs/services/brickbot.hcl
@@ -23,7 +23,7 @@ job "brickbot2" {
       template {
         destination = "local/ldap.secret"
         perms       = "600"
-        data = "{{ key \"api/ldap/secret\" }}" # this is necessary as the secret has no EOF
+        data        = "{{ key \"api/ldap/secret\" }}" # this is necessary as the secret has no EOF
       }
 
       template {
diff --git a/jobs/services/hedgedoc-backup.hcl b/jobs/services/hedgedoc-backup.hcl
index 71cd9a2..2b8dedb 100644
--- a/jobs/services/hedgedoc-backup.hcl
+++ b/jobs/services/hedgedoc-backup.hcl
@@ -17,7 +17,7 @@ job "hedgedoc-backup" {
       }
 
       template {
-        data = <<EOH
+        data        = <<EOH
 #!/bin/bash
 
 file=/storage/backups/nomad/postgres/hedgedoc/postgresql-hedgedoc-$(date +%Y-%m-%d_%H-%M-%S).sql
diff --git a/jobs/services/hedgedoc.hcl b/jobs/services/hedgedoc.hcl
index eed1fd3..f418ed6 100644
--- a/jobs/services/hedgedoc.hcl
+++ b/jobs/services/hedgedoc.hcl
@@ -5,7 +5,7 @@ job "hedgedoc" {
 
   group "web" {
     network {
-    # mode = "bridge"
+      # mode = "bridge"
       port "http" {
         to = 3000
       }
@@ -30,11 +30,10 @@ job "hedgedoc" {
         "traefik.frontend.headers.STSSeconds=63072000",
         "traefik.frontend.headers.browserXSSFilter=true",
         "traefik.frontend.headers.contentTypeNosniff=true",
-        "traefik.frontend.headers.customResponseHeaders=alt-svc:h2=l3sb47bzhpbelafss42pspxzqo3tipuk6bg7nnbacxdfbz7ao6semtyd.onion:443; ma=2592000",
         "traefik.enable=true",
         "traefik.port=${NOMAD_PORT_http}",
+        "traefik.http.routers.md.entrypoints=web,websecure",
         "traefik.http.routers.md.rule=Host(`md.redbrick.dcu.ie`) || Host(`md.rb.dcu.ie`)",
-        "traefik.http.routers.md.tls=true",
         "traefik.http.routers.md.tls.certresolver=lets-encrypt",
       ]
     }
@@ -44,7 +43,7 @@ job "hedgedoc" {
 
       constraint {
         attribute = "${attr.unique.hostname}"
-        value = "chell"
+        value     = "chell"
       }
 
       config {
@@ -89,7 +88,7 @@ EOH
 
       constraint {
         attribute = "${attr.unique.hostname}"
-        value = "chell"
+        value     = "chell"
       }
 
       config {
@@ -97,7 +96,7 @@ EOH
         ports = ["db"]
 
         volumes = [
-            "/opt/postgres/hedgedoc:/var/lib/postgresql/data"
+          "/opt/postgres/hedgedoc:/var/lib/postgresql/data"
         ]
       }
 
diff --git a/jobs/services/members-mysql-backup.hcl b/jobs/services/members-mysql-backup.hcl
index c07b00f..208e0c0 100644
--- a/jobs/services/members-mysql-backup.hcl
+++ b/jobs/services/members-mysql-backup.hcl
@@ -17,7 +17,7 @@ job "members-mysql-backup" {
       }
 
       template {
-        data = <<EOH
+        data        = <<EOH
 #!/bin/bash
 
 file=/storage/backups/nomad/mysql/members/members-mysql-$(date +%Y-%m-%d_%H-%M-%S).sql
diff --git a/jobs/services/members-mysql.hcl b/jobs/services/members-mysql.hcl
index 6587da7..bc7c47f 100644
--- a/jobs/services/members-mysql.hcl
+++ b/jobs/services/members-mysql.hcl
@@ -38,7 +38,7 @@ EOH
       }
 
       template {
-        data = <<EOH
+        data        = <<EOH
 [server]
 
 [mariadbd]
diff --git a/jobs/services/plausible.hcl b/jobs/services/plausible.hcl
index 65ebaf0..a186b96 100644
--- a/jobs/services/plausible.hcl
+++ b/jobs/services/plausible.hcl
@@ -1,6 +1,6 @@
 job "plausible" {
   datacenters = ["aperture"]
-  type = "service"
+  type        = "service"
 
   group "web" {
     network {
@@ -18,16 +18,16 @@ job "plausible" {
         port = "http"
 
         check {
-          type = "http"
-          path = "/"
+          type     = "http"
+          path     = "/"
           interval = "10s"
-          timeout = "2s"
+          timeout  = "2s"
         }
 
         tags = [
           "traefik.enable=true",
           "traefik.http.routers.plausible.rule=Host(`plausible.redbrick.dcu.ie`)",
-          "traefik.http.routers.plausible.entrypoints=websecure",
+          "traefik.http.routers.plausible.entrypoints=web,websecure",
           "traefik.http.routers.plausible.tls.certresolver=lets-encrypt"
         ]
       }
@@ -39,11 +39,11 @@ job "plausible" {
         ports = ["http"]
 
         command = "/bin/sh"
-        args = ["-c", "sleep 10 && /entrypoint.sh db migrate && /entrypoint.sh run"]
+        args    = ["-c", "sleep 10 && /entrypoint.sh db migrate && /entrypoint.sh run"]
       }
 
       template {
-        data = <<EOH
+        data        = <<EOH
 BASE_URL=https://plausible.redbrick.dcu.ie
 SECRET_KEY_BASE={{ key "plausible/secret" }}
 TOTP_VAULT_KEY={{ key "plausible/totp/key" }}
@@ -72,7 +72,7 @@ SMTP_USER_PWD={{ key "plausible/smtp/password" }}
 DISABLE_REGISTRATION=invite_only
 EOH
         destination = "local/file.env"
-        env = true
+        env         = true
       }
 
       resources {
@@ -104,7 +104,7 @@ EOH
       }
 
       template {
-        data = <<EOH
+        data        = <<EOH
 <clickhouse>
     <logger>
         <level>warning</level>
@@ -126,7 +126,7 @@ EOH
       }
 
       template {
-        data = <<EOH
+        data        = <<EOH
 <clickhouse>
     <profiles>
         <default>
diff --git a/jobs/services/postgres-backup.hcl b/jobs/services/postgres-backup.hcl
index e29964b..af2c7c0 100644
--- a/jobs/services/postgres-backup.hcl
+++ b/jobs/services/postgres-backup.hcl
@@ -17,7 +17,7 @@ job "postgres-backup" {
       }
 
       template {
-        data = <<EOH
+        data        = <<EOH
 #!/bin/bash
 
 file=/storage/backups/nomad/postgres/postgres-$(date +%Y-%m-%d_%H-%M-%S).sql
diff --git a/jobs/services/privatebin.hcl b/jobs/services/privatebin.hcl
index 12524d2..48644e2 100644
--- a/jobs/services/privatebin.hcl
+++ b/jobs/services/privatebin.hcl
@@ -17,10 +17,10 @@ job "privatebin" {
       port = "http"
 
       check {
-        type = "http"
-        path = "/"
+        type     = "http"
+        path     = "/"
         interval = "10s"
-        timeout = "2s"
+        timeout  = "2s"
       }
 
       tags = [
diff --git a/jobs/services/shlink.hcl b/jobs/services/shlink.hcl
index cf61d6c..6dd1879 100644
--- a/jobs/services/shlink.hcl
+++ b/jobs/services/shlink.hcl
@@ -19,6 +19,7 @@ job "shlink" {
 
       tags = [
         "traefik.enable=true",
+        "traefik.http.routers.shlink-api.entrypoints=web,websecure",
         "traefik.http.routers.shlink-api.rule=Host(`s.rb.dcu.ie`)",
         "traefik.http.routers.shlink-api.tls=true",
         "traefik.http.routers.shlink-api.tls.certresolver=lets-encrypt",
@@ -77,6 +78,7 @@ EOH
 #
 #        tags = [
 #          "traefik.enable=true",
+#          "traefik.http.routers.shlink-web.entrypoints=web,websecure",
 #          "traefik.http.routers.shlink-web.rule=Host(`shlink.rb.dcu.ie`)",
 #          "traefik.http.routers.shlink-web.tls=true",
 #          "traefik.http.routers.shlink-web.tls.certresolver=lets-encrypt",
diff --git a/jobs/socs/dcusr-outline.hcl b/jobs/socs/dcusr-outline.hcl
index 0052676..51a9748 100644
--- a/jobs/socs/dcusr-outline.hcl
+++ b/jobs/socs/dcusr-outline.hcl
@@ -37,6 +37,7 @@ job "dcusr-outline" {
       tags = [
         "traefik.enable=true",
         "traefik.port=${NOMAD_PORT_http}",
+        "traefik.http.routers.dcusr-outline.entrypoints=web,websecure",
         "traefik.http.routers.dcusr-outline.rule=Host(`${NOMAD_META_domain}`)",
         "traefik.http.routers.dcusr-outline.tls=true",
         "traefik.http.routers.dcusr-outline.tls.certresolver=lets-encrypt",
diff --git a/jobs/user-projects/general/midnight-calendarbot.hcl b/jobs/user-projects/general/midnight-calendarbot.hcl
index 1362e7b..2786cd5 100644
--- a/jobs/user-projects/general/midnight-calendarbot.hcl
+++ b/jobs/user-projects/general/midnight-calendarbot.hcl
@@ -1,6 +1,6 @@
 job "midnight-calendarbot" {
   datacenters = ["aperture"]
-  type = "service"
+  type        = "service"
 
   group "calendarbot" {
     count = 1
@@ -9,17 +9,17 @@ job "midnight-calendarbot" {
       driver = "docker"
 
       config {
-        image = "ghcr.io/nightmarishblue/calendarbot:master"
+        image      = "ghcr.io/nightmarishblue/calendarbot:latest"
         force_pull = true
       }
 
       template {
-        data = <<EOH
+        data        = <<EOH
 BOT_TOKEN={{ key "user-projects/midnight/calendarbot/discord/token" }}
 APPLICATION_ID={{ key "user-projects/midnight/calendarbot/discord/appid" }}
 EOH
         destination = "local/.env"
-        env = true
+        env         = true
       }
     }
   }