diff --git a/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs
index e11923ac8c..d6b40fa7f7 100644
--- a/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs
@@ -523,7 +523,7 @@ internal sealed class JpegDecoderCore : IRawJpegData, IImageDecoderInternals
     /// <param name="markerContentByteSize">The remaining bytes in the segment block.</param>
     private void ProcessComMarker(BufferedReadStream stream, int markerContentByteSize)
     {
-        Span<byte> temp = stackalloc byte[markerContentByteSize];
+        Span<byte> temp = new byte[markerContentByteSize];
         char[] chars = new char[markerContentByteSize];
         JpegMetadata metadata = this.Metadata.GetFormatMetadata(JpegFormat.Instance);
 
diff --git a/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs b/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs
index cc6042b6ef..1b2b4cbb1c 100644
--- a/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs
@@ -185,7 +185,7 @@ internal sealed unsafe partial class JpegEncoderCore : IImageEncoderInternals
         // Length (comment strings lengths) + (comments markers with payload sizes)
         int commentsBytes = metadata.Comments.Sum(x => x.Length) + (metadata.Comments.Count * 4);
         int commentStart = 0;
-        Span<byte> commentBuffer = stackalloc byte[commentsBytes];
+        Span<byte> commentBuffer = new byte[commentsBytes];
 
         foreach (Memory<char> comment in metadata.Comments)
         {
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.Metadata.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.Metadata.cs
index fa54859a36..bd68eaf208 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.Metadata.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.Metadata.cs
@@ -137,7 +137,7 @@ public partial class JpegEncoderTests
     [MemberData(nameof(QualityFiles))]
     public void Encode_PreservesQuality(string imagePath, int quality)
     {
-        var testFile = TestFile.Create(imagePath);
+        TestFile testFile = TestFile.Create(imagePath);
         using (Image<Rgba32> input = testFile.CreateRgba32Image())
         {
             using (var memStream = new MemoryStream())
@@ -160,7 +160,7 @@ public partial class JpegEncoderTests
         where TPixel : unmanaged, IPixel<TPixel>
     {
         // arrange
-        using var input = provider.GetImage(JpegDecoder.Instance);
+        using Image<TPixel> input = provider.GetImage(JpegDecoder.Instance);
         using var memStream = new MemoryStream();
 
         // act
@@ -168,7 +168,7 @@ public partial class JpegEncoderTests
 
         // assert
         memStream.Position = 0;
-        using var output = Image.Load<Rgba32>(memStream);
+        using Image<Rgba32> output = Image.Load<Rgba32>(memStream);
         JpegMetadata actual = output.Metadata.GetJpegMetadata();
         Assert.NotEmpty(actual.Comments);
         Assert.Equal(1, actual.Comments.Count);
@@ -190,7 +190,7 @@ public partial class JpegEncoderTests
 
         // assert
         memStream.Position = 0;
-        using var output = Image.Load<Rgba32>(memStream);
+        using Image<Rgba32> output = Image.Load<Rgba32>(memStream);
         JpegMetadata actual = output.Metadata.GetJpegMetadata();
         Assert.NotEmpty(actual.Comments);
         Assert.Equal(2, actual.Comments?.Count);