diff --git a/src/Docker.DotNet/Base64Converter.cs b/src/Docker.DotNet/Base64Converter.cs
index 66e3e302..1b2a37ea 100644
--- a/src/Docker.DotNet/Base64Converter.cs
+++ b/src/Docker.DotNet/Base64Converter.cs
@@ -4,13 +4,11 @@ internal class Base64Converter : JsonConverter<IList<byte>>
 {
     public override IList<byte> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-        var base64String = reader.GetString();
-        return base64String == null ? null : Convert.FromBase64String(base64String);
+        return reader.GetBytesFromBase64();
     }
 
     public override void Write(Utf8JsonWriter writer, IList<byte> value, JsonSerializerOptions options)
     {
-        var base64String = Convert.ToBase64String(value.ToArray());
-        writer.WriteStringValue(base64String);
+        writer.WriteBase64StringValue(value.ToArray());
     }
 }
\ No newline at end of file