diff --git a/lib/java_buildpack/jre/jvmkill_agent.rb b/lib/java_buildpack/jre/jvmkill_agent.rb
index d435d55adf..33f15a789b 100644
--- a/lib/java_buildpack/jre/jvmkill_agent.rb
+++ b/lib/java_buildpack/jre/jvmkill_agent.rb
@@ -57,7 +57,7 @@ def supports?
       private_constant :FILTER
 
       def application_identifier
-        "#{@application.details['application_name']}-#{@application.details['application_id']}"
+        "#{@application.details['application_name']}-#{@application.details['application_id'][0...8]}"
       end
 
       def container_dir
@@ -69,7 +69,7 @@ def heap_dump_path
       end
 
       def instance_identifier
-        '$CF_INSTANCE_INDEX-%FT%T%z-$CF_INSTANCE_GUID'
+        '$CF_INSTANCE_INDEX-%FT%T%z-${CF_INSTANCE_GUID:0:8}'
       end
 
       def jvmkill_agent
@@ -77,7 +77,7 @@ def jvmkill_agent
       end
 
       def space_identifier
-        "#{@application.details['space_name']}-#{@application.details['space_id']}"
+        "#{@application.details['space_name']}-#{@application.details['space_id'][0...8]}"
       end
 
     end
diff --git a/spec/java_buildpack/jre/jvmkill_agent_spec.rb b/spec/java_buildpack/jre/jvmkill_agent_spec.rb
index df87f10952..7bd160c741 100644
--- a/spec/java_buildpack/jre/jvmkill_agent_spec.rb
+++ b/spec/java_buildpack/jre/jvmkill_agent_spec.rb
@@ -50,9 +50,9 @@
     component.release
 
     expect(java_opts).to include('-agentpath:$PWD/.java-buildpack/jvmkill_agent/bin/jvmkill-0.0.0=' \
-                                 'printHeapHistogram=1,heapDumpPath=test-container-dir/test-space-name-test-space-id/' \
-                                 'test-application-name-test-application-id/$CF_INSTANCE_INDEX-%FT%T%z-' \
-                                 '$CF_INSTANCE_GUID.hprof')
+                                 'printHeapHistogram=1,heapDumpPath=test-container-dir/test-space-name-test-spa/' \
+                                 'test-application-name-test-app/$CF_INSTANCE_INDEX-%FT%T%z-' \
+                                 '${CF_INSTANCE_GUID:0:8}.hprof')
   end
 
 end