diff --git a/devspc/devspace-apiregistry-core-service/templates/deployment.yaml b/devspc/devspace-apiregistry-core-service/templates/deployment.yaml
index 2cb1d8c..4ad27bc 100644
--- a/devspc/devspace-apiregistry-core-service/templates/deployment.yaml
+++ b/devspc/devspace-apiregistry-core-service/templates/deployment.yaml
@@ -57,6 +57,9 @@ spec:
             items:
               - key: application.yaml
                 path: application.yaml
+        - name: heapdumps-data
+          persistentVolumeClaim:
+            claimName: "{{$.Release.Name}}-{{$.Chart.Name}}-heapdumps"
       securityContext:
         {{- toYaml $.Values.podSecurityContext | nindent 8 }}
       containers:
@@ -68,9 +71,13 @@ spec:
           env:
             - name: SPRING_CONFIG_ADDITIONAL_LOCATION
               value: "file:/opt/app/config/application.yaml"
+            - name: JAVA_TOOL_OPTIONS
+              value: "-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/storage/heap_oom.hprof"
           volumeMounts:
             - mountPath: '/opt/app/config'
               name: application-properties-volume
+            - name: heapdumps-data
+              mountPath: /storage
           ports:
             - name: http
               containerPort: {{ $.Values.port }}