diff --git a/example/images/matrix-element/Dockerfile b/example/images/matrix-element/Dockerfile
index b369b54..2d03049 100644
--- a/example/images/matrix-element/Dockerfile
+++ b/example/images/matrix-element/Dockerfile
@@ -1,7 +1,7 @@
 FROM nginxinc/nginx-unprivileged:alpine
 MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
 
-ARG ELEMENT_VERSION=1.11.63 \
+ARG ELEMENT_VERSION=1.11.64 \
     SYNAPSE_ADMIN_VERSION=0.9.1
 
 ENV ELEMENT_NGINX_BIND_ADDR=0.0.0.0 \
diff --git a/example/matrix.nomad.hcl b/example/matrix.nomad.hcl
index 27db209..c1682ac 100644
--- a/example/matrix.nomad.hcl
+++ b/example/matrix.nomad.hcl
@@ -1,18 +1,27 @@
 job "matrix" {
-
   datacenters = ["dc1"]
   region      = "global"
 
 
-
-
   group "matrix" {
 
+
+    shutdown_delay = "6s"
+
+
+
+    ephemeral_disk {
+      # Use minimal ephemeral disk
+      size = 101
+    }
+
+
     network {
       mode = "bridge"
     }
 
 
+
     volume "data" {
       source          = "matrix-synapse-data"
       type            = "csi"
@@ -317,7 +326,7 @@ _EOT
       driver = "docker"
 
       config {
-        image           = "danielberteaud/matrix-element:1.11.63-1"
+        image           = "danielberteaud/matrix-element:1.11.64-1"
         readonly_rootfs = true
         pids_limit      = 100
         volumes = [
diff --git a/matrix.nomad.hcl b/matrix.nomad.hcl
index c5d70a9..984985e 100644
--- a/matrix.nomad.hcl
+++ b/matrix.nomad.hcl
@@ -1,9 +1,12 @@
 job "[[ .instance ]]" {
-[[ $c := merge .matrix.synapse .matrix . -]]
+[[- $c := merge .matrix . -]]
 
 [[ template "common/job_start" $c ]]
 
   group "matrix" {
+[[- $c := merge $c.synapse $c ]]
+
+[[ template "common/group_start" $c ]]
 
     network {
       mode = "bridge"
diff --git a/variables.yml b/variables.yml
index d8ab346..3dbd285 100644
--- a/variables.yml
+++ b/variables.yml
@@ -110,7 +110,7 @@ matrix:
   # Note : element will be served by the nginx container, so all the image, resources etc. are set there
   element:
     map_style_url: https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx
-    version: 1.11.63
+    version: 1.11.64
 
   synapse_admin:
     version: 0.9.1