diff --git a/charts/armada/templates/deployment-api.yaml b/charts/armada/templates/deployment-api.yaml
index 60b84615..3b17d29c 100644
--- a/charts/armada/templates/deployment-api.yaml
+++ b/charts/armada/templates/deployment-api.yaml
@@ -138,8 +138,6 @@ spec:
           volumeMounts:
             - name: pod-tmp
               mountPath: /tmp
-            - name: pod-tmp-metrics
-              mountPath: /tmp/armada/metrics
             - name: pod-etc-armada
               mountPath: /etc/armada
             - name: armada-etc
@@ -195,9 +193,6 @@ spec:
       volumes:
         - name: pod-tmp
           emptyDir: {}
-        - name: pod-tmp-metrics
-          emptyDir:
-            medium: Memory
         - name: pod-etc-armada
           emptyDir: {}
         - name: armada-bin
diff --git a/entrypoint.sh b/entrypoint.sh
index 6a84f3f2..5c1fe87e 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -27,7 +27,7 @@ ARMADA_UWSGI_WORKERS=${ARMADA_UWSGI_WORKERS:-4}
 # Threads per worker
 ARMADA_UWSGI_THREADS=${ARMADA_UWSGI_THREADS:-1}
 # Prometheus multiprocess dir
-ARMADA_PROMETHEUS_MULTIPROC_DIR=${ARMADA_PROMETHEUS_MULTIPROC_DIR:-$(mktemp -d -p /tmp/armada/metrics XXXXXX)}
+ARMADA_PROMETHEUS_MULTIPROC_DIR=${ARMADA_PROMETHEUS_MULTIPROC_DIR:-$(mktemp -d -p /tmp armada-metrics-XXXXXX)}
 
 # Start Armada application
 # TODO(fmontei): Should be specifying callable too. But Armada spins up the