diff --git a/images/kafka-broker/root/entrypoint.d/40-kafka.env b/images/kafka-broker/root/entrypoint.d/40-kafka.env
index 57fcd6b..be8b65d 100755
--- a/images/kafka-broker/root/entrypoint.d/40-kafka.env
+++ b/images/kafka-broker/root/entrypoint.d/40-kafka.env
@@ -1,6 +1,10 @@
 #!/bin/sh
 
 set -eo pipefail
+
+export KAFKA_OPTS="${KAFKA_OPTS} ${JAVA_OPTS}"
+echo KAFKA_OPTS=${KAFKA_OPTS}
+
 if [ -w "${KAFKA_CONF_DIR}/server.properties" ]; then
   umask 077
   TMPCONF=$(mktemp)
diff --git a/kafka-brokers.nomad.hcl b/kafka-brokers.nomad.hcl
index 9897df0..c3fca72 100644
--- a/kafka-brokers.nomad.hcl
+++ b/kafka-brokers.nomad.hcl
@@ -58,6 +58,7 @@ job "[[ .instance ]]-brokers" {
     }
 
 [[ template "common/task.wait_for" $c ]]
+[[ template "common/task.metrics_proxy" $c ]]
 
     task "kafka-broker" {
       driver = "[[ $c.nomad.driver ]]"
@@ -89,7 +90,7 @@ job "[[ .instance ]]-brokers" {
       template {
         data        = <<_EOT
 KAFKA_HEAP_OPTS=-Xmx[[ $c.resources.memory | mul 0.3 | math.Ceil ]]m -Xms[[ $c.resources.memory | mul 0.3 | math.Ceil ]]m
-KAFKA_OPTS=-javaagent:/jmx_exporter/jmx_prometheus_javaagent.jar=127.0.0.1:9404:/opt/kafka/config/jmx_exporter.yml
+KAFKA_OPTS=-Djava.io.tmpdir=/local/tmp -javaagent:/jmx_exporter/jmx_prometheus_javaagent.jar=127.0.0.1:9404:/opt/kafka/config/jmx_exporter.yml
 [[- if ne $c.zookeeper.user "" ]] -Djava.security.auth.login.config=/secrets/jaas.conf[[- end ]]
 _EOT
         destination = "secrets/.kafka.env"
diff --git a/variables.yml b/variables.yml
index ccfdacf..10b5055 100644
--- a/variables.yml
+++ b/variables.yml
@@ -11,13 +11,14 @@ kafka:
   broker:
     count: 3
     version: 3.7.0
-    image: '[[ .docker.repo ]]kafka-broker:[[ .kafka.broker.version ]]-3'
+    image: '[[ .docker.repo ]]kafka-broker:[[ .kafka.broker.version ]]-4'
     env: {}
     resources:
       cpu: 100
       memory: 1024
     prometheus:
       enabled: '[[ .prometheus.available ]]'
+      metrics_url: http://127.0.0.1:9404/metrics
     # static_client_port: 9092
     # static_broker_port: 9095
     nomad: