diff --git a/ProjectPlugins/CodexPlugin/CodexNode.cs b/ProjectPlugins/CodexPlugin/CodexNode.cs
index 3c033696..004ab72d 100644
--- a/ProjectPlugins/CodexPlugin/CodexNode.cs
+++ b/ProjectPlugins/CodexPlugin/CodexNode.cs
@@ -140,7 +140,7 @@ namespace CodexPlugin
 
         public ContentId UploadFile(TrackedFile file, Action<Failure> onFailure)
         {
-            return UploadFile(file, "random-test-data", "random-test-data", onFailure);
+            return UploadFile(file, "application/x-binary", $"attachment; filename=\"{file.Filename}\"", onFailure);
         }
 
         public ContentId UploadFile(TrackedFile file, string contentType, string contentDisposition, Action<Failure> onFailure)
diff --git a/Tools/AutoClient/Purchaser.cs b/Tools/AutoClient/Purchaser.cs
index d31d91d4..b846f4a0 100644
--- a/Tools/AutoClient/Purchaser.cs
+++ b/Tools/AutoClient/Purchaser.cs
@@ -119,7 +119,7 @@ namespace AutoClient
             {
                 var info = new FileInfo(filename);
                 var sw = System.Diagnostics.Stopwatch.StartNew();
-                var cid = await UploadStream(fileStream);
+                var cid = await UploadStream(fileStream, filename);
                 var time = sw.Elapsed;
                 app.Performance.UploadSuccessful(info.Length, time);
                 app.CidRepo.Add(nodeId, cid.Id, info.Length);
@@ -132,12 +132,12 @@ namespace AutoClient
             }
         }
 
-        private async Task<ContentId> UploadStream(FileStream fileStream)
+        private async Task<ContentId> UploadStream(FileStream fileStream, string filename)
         {
             log.Debug($"Uploading file...");
             var response = await codex.UploadAsync(
-                content_type: "autoclient-test-content",
-                content_disposition: "autoclient-test-content",
+                content_type: "application/x-binary",
+                content_disposition: $"attachment; filename=\"{filename}\"",
                 fileStream, app.Cts.Token);
 
             if (string.IsNullOrEmpty(response)) FrameworkAssert.Fail("Received empty response.");