diff --git a/jobs/uaa/templates/config/log4j2.properties.erb b/jobs/uaa/templates/config/log4j2.properties.erb
index 937606ca2c..8a143fc369 100644
--- a/jobs/uaa/templates/config/log4j2.properties.erb
+++ b/jobs/uaa/templates/config/log4j2.properties.erb
@@ -15,7 +15,7 @@ case logging_format_timestamp_value
 end
 %>
 property.log_directory = /var/vcap/sys/log/uaa
-property.log_pattern=[<%= timestamp_format %>] uaa%X{context} - %pid [%t] .... %5p --- %c{1}: %replace{%m}{(?<=password=|client_secret=)([^&]*)}{<redacted>}%n
+property.log_pattern=[<%= timestamp_format %>] uaa%X{context} - %pid [%t] - [%X{traceId},%X{spanId}] .... %5p --- %c{1}: %replace{%m}{(?<=password=|client_secret=)([^&]*)}{<redacted>}%n
 
 appender.uaaDefaultAppender.type = File
 appender.uaaDefaultAppender.name = UaaDefaultAppender
diff --git a/spec/compare/all-properties-set-log4j2.properties b/spec/compare/all-properties-set-log4j2.properties
index db9006e9b6..e0f4fd8128 100644
--- a/spec/compare/all-properties-set-log4j2.properties
+++ b/spec/compare/all-properties-set-log4j2.properties
@@ -3,7 +3,7 @@ dest = err
 name = UaaLog
 
 property.log_directory = /var/vcap/sys/log/uaa
-property.log_pattern=[%d{yyyy-MM-dd'T'HH:mm:ss.nnnnnn}{GMT+0}Z] uaa%X{context} - %pid [%t] .... %5p --- %c{1}: %replace{%m}{(?<=password=|client_secret=)([^&]*)}{<redacted>}%n
+property.log_pattern=[%d{yyyy-MM-dd'T'HH:mm:ss.nnnnnn}{GMT+0}Z] uaa%X{context} - %pid [%t] - [%X{traceId},%X{spanId}] .... %5p --- %c{1}: %replace{%m}{(?<=password=|client_secret=)([^&]*)}{<redacted>}%n
 
 appender.uaaDefaultAppender.type = File
 appender.uaaDefaultAppender.name = UaaDefaultAppender
diff --git a/spec/compare/default-log4j2-template.properties b/spec/compare/default-log4j2-template.properties
index 03748d76c6..c67608aecc 100644
--- a/spec/compare/default-log4j2-template.properties
+++ b/spec/compare/default-log4j2-template.properties
@@ -3,7 +3,7 @@ dest = err
 name = UaaLog
 
 property.log_directory = /var/vcap/sys/log/uaa
-property.log_pattern=[EXPECTED_LOG_PATTERN_PLACEHOLDER] uaa%X{context} - %pid [%t] .... %5p --- %c{1}: %replace{%m}{(?<=password=|client_secret=)([^&]*)}{<redacted>}%n
+property.log_pattern=[EXPECTED_LOG_PATTERN_PLACEHOLDER] uaa%X{context} - %pid [%t] - [%X{traceId},%X{spanId}] .... %5p --- %c{1}: %replace{%m}{(?<=password=|client_secret=)([^&]*)}{<redacted>}%n
 
 appender.uaaDefaultAppender.type = File
 appender.uaaDefaultAppender.name = UaaDefaultAppender
diff --git a/spec/compare/default-log4j2.properties b/spec/compare/default-log4j2.properties
index f23b445440..9f513b0ca9 100644
--- a/spec/compare/default-log4j2.properties
+++ b/spec/compare/default-log4j2.properties
@@ -3,7 +3,7 @@ dest = err
 name = UaaLog
 
 property.log_directory = /var/vcap/sys/log/uaa
-property.log_pattern=[%d{yyyy-MM-dd'T'HH:mm:ss.nnnnnn}{GMT+0}Z] uaa%X{context} - %pid [%t] .... %5p --- %c{1}: %replace{%m}{(?<=password=|client_secret=)([^&]*)}{<redacted>}%n
+property.log_pattern=[%d{yyyy-MM-dd'T'HH:mm:ss.nnnnnn}{GMT+0}Z] uaa%X{context} - %pid [%t] - [%X{traceId},%X{spanId}] .... %5p --- %c{1}: %replace{%m}{(?<=password=|client_secret=)([^&]*)}{<redacted>}%n
 
 appender.uaaDefaultAppender.type = File
 appender.uaaDefaultAppender.name = UaaDefaultAppender
diff --git a/src/acceptance_tests/uaa-release_test.go b/src/acceptance_tests/uaa-release_test.go
index 5f27d17a32..38bc9996dd 100644
--- a/src/acceptance_tests/uaa-release_test.go
+++ b/src/acceptance_tests/uaa-release_test.go
@@ -140,9 +140,12 @@ var _ = Describe("UaaRelease", func() {
 
 	})
 
-	logLineWithoutTimestampRegex := ` uaa.* - \d+ \[([^]]+)\] .... (DEBUG|\sINFO|\sWARN) --- .+: .+`
+	logLineWithoutTimestampRegex := ` uaa.* - \d+ \[([^]]+)\] - \[[^]]+\] .... (DEBUG|\sINFO|\sWARN) --- .+: .+`
 
-	DescribeTable("UAA log format", func(uaaLogFormat string, optFiles ...string) {
+	DescribeTable("UAA log format", func(
+		uaaLogFormat string,
+		optFiles ...string,
+	) {
 		deployUAA(optFiles...)
 
 		logPath := scpUAALog()
@@ -292,7 +295,10 @@ func scpUaaAuditLog() string {
 	return localUAALogPath
 }
 
-func getFingerPrint(certdata []byte) (string, error) {
+func getFingerPrint(certdata []byte) (
+	string,
+	error,
+) {
 	var block *pem.Block
 	block, _ = pem.Decode(certdata)