diff --git a/src/Squidex.Infrastructure/Log/JsonLogWriter.cs b/src/Squidex.Infrastructure/Log/JsonLogWriter.cs
index 987785280..7d9bdf21f 100644
--- a/src/Squidex.Infrastructure/Log/JsonLogWriter.cs
+++ b/src/Squidex.Infrastructure/Log/JsonLogWriter.cs
@@ -63,7 +63,7 @@ namespace Squidex.Infrastructure.Log
 
         IArrayWriter IArrayWriter.WriteValue(DateTimeOffset value)
         {
-            jsonWriter.WriteValue(value.ToString("yyyy-MM-ddTHH:mm:ss.fffZ", CultureInfo.InvariantCulture));
+            jsonWriter.WriteValue(value.ToString("o", CultureInfo.InvariantCulture));
 
             return this;
         }
diff --git a/tests/Squidex.Infrastructure.Tests/Log/JsonLogWriterTests.cs b/tests/Squidex.Infrastructure.Tests/Log/JsonLogWriterTests.cs
index d06255e23..a0ff04d7a 100644
--- a/tests/Squidex.Infrastructure.Tests/Log/JsonLogWriterTests.cs
+++ b/tests/Squidex.Infrastructure.Tests/Log/JsonLogWriterTests.cs
@@ -136,7 +136,7 @@ namespace Squidex.Infrastructure.Log
             var value = DateTime.UtcNow;
             var result = sut.WriteArray("property", a => a.WriteValue(value)).ToString();
 
-            Assert.Equal($"{{\"property\":[\"{value:o}\"]}}", result);
+            Assert.Equal($"{{\"property\":[\"{value:yyyy-MM-ddTHH:mm:ssZ}\"]}}", result);
         }
 
         [Fact]
diff --git a/tests/Squidex.Infrastructure.Tests/MongoDb/BsonConverterTests.cs b/tests/Squidex.Infrastructure.Tests/MongoDb/BsonConverterTests.cs
index f943ffb91..d3d5b8ab4 100644
--- a/tests/Squidex.Infrastructure.Tests/MongoDb/BsonConverterTests.cs
+++ b/tests/Squidex.Infrastructure.Tests/MongoDb/BsonConverterTests.cs
@@ -87,8 +87,8 @@ namespace Squidex.Infrastructure.MongoDb
                     Bool = true,
                     Byte = 0x2,
                     Bytes = new byte[] { 0x10, 0x12, 0x13 },
-                    DateTimeOffset = DateTime.Today,
-                    DateTime = DateTime.Today,
+                    DateTimeOffset = DateTime.UtcNow.Date,
+                    DateTime = DateTime.UtcNow.Date,
                     Float32 = 32.5f,
                     Float64 = 32.5d,
                     Guid = Guid.NewGuid(),