diff --git a/models/attachments.js b/models/attachments.js
index 773bb4a43..614dd3332 100644
--- a/models/attachments.js
+++ b/models/attachments.js
@@ -5,8 +5,6 @@ import { createOnAfterUpload } from './lib/fsHooks/createOnAfterUpload';
 import { createInterceptDownload } from './lib/fsHooks/createInterceptDownload';
 import { createOnAfterRemove } from './lib/fsHooks/createOnAfterRemove';
 
-const os = require('os');
-
 let attachmentBucket;
 if (Meteor.isServer) {
   attachmentBucket = createBucket('attachments');
@@ -33,7 +31,6 @@ const insertActivity = (fileObj, activityType) =>
 Attachments = new FilesCollection({
   debug: false, // Change to `true` for debugging
   collectionName: 'attachments',
-  storagePath: os.tmpdir(),
   allowClientCode: true,
   onAfterUpload: function onAfterUpload(fileRef) {
     createOnAfterUpload(attachmentBucket).call(this, fileRef);
diff --git a/models/avatars.js b/models/avatars.js
index b739f8eb3..d45dc3df6 100644
--- a/models/avatars.js
+++ b/models/avatars.js
@@ -5,8 +5,6 @@ import { createOnAfterUpload } from './lib/fsHooks/createOnAfterUpload';
 import { createInterceptDownload } from './lib/fsHooks/createInterceptDownload';
 import { createOnAfterRemove } from './lib/fsHooks/createOnAfterRemove';
 
-const os = require('os');
-
 let avatarsBucket;
 if (Meteor.isServer) {
   avatarsBucket = createBucket('avatars');
@@ -15,7 +13,6 @@ if (Meteor.isServer) {
 Avatars = new FilesCollection({
   debug: false, // Change to `true` for debugging
   collectionName: 'avatars',
-  storagePath: os.tmpdir(),
   allowClientCode: true,
   onBeforeUpload(file) {
     if (file.size <= 72000 && file.type.startsWith('image/')) {
diff --git a/server/migrations.js b/server/migrations.js
index 99030e98b..6cb88d786 100644
--- a/server/migrations.js
+++ b/server/migrations.js
@@ -22,6 +22,9 @@ import Swimlanes from '../models/swimlanes';
 import Triggers from '../models/triggers';
 import UnsavedEdits from '../models/unsavedEdits';
 import Users from '../models/users';
+
+const fs = require('fs');
+
 // Anytime you change the schema of one of the collection in a non-backward
 // compatible way you have to write a migration in this file using the following
 // API:
@@ -1124,17 +1127,14 @@ Migrations.add('add-card-details-show-lists', () => {
 });
 
 Migrations.add('migrate-attachments-collectionFS-to-ostrioFiles', () => {
-  const os = require('os');
-  const fs = require('fs');
-  const path = require('path');
-  tmdir = os.tmpdir();
-
   AttachmentsOld.find().forEach(function(fileObj) {
     //console.log('File: ', fileObj.userId);
 
     // This directory must be writable on server, so a test run first
-    // We are going to copy the files locally, then move them to mongo bucket
-    const fileName = path.join(tmpdir, `${fileObj._id}-${fileObj.name()}`);
+    // We are going to copy the files locally, then move them to S3
+    const fileName = `./assets/app/uploads/attachments/${
+      fileObj._id
+    }-${fileObj.name()}`;
     const newFileName = fileObj.name();
 
     // This is "example" variable, change it to the userId that you might be using.
@@ -1192,18 +1192,16 @@ Migrations.add('migrate-attachments-collectionFS-to-ostrioFiles', () => {
     readStream.pipe(writeStream);
   });
 });
-Migrations.add('migrate-avatars-collectionFS-to-ostrioFiles', () => {
-  const os = require('os');
-  const fs = require('fs');
-  const path = require('path');
-  tmdir = os.tmpdir();
 
+Migrations.add('migrate-avatars-collectionFS-to-ostrioFiles', () => {
   AvatarsOld.find().forEach(function(fileObj) {
     //console.log('File: ', fileObj.userId);
 
     // This directory must be writable on server, so a test run first
-    // We are going to copy the files locally, then move them to mongo bucket
-    const fileName = path.join(tmpdir, `${fileObj._id}-${fileObj.name()}`);
+    // We are going to copy the files locally, then move them to S3
+    const fileName = `./assets/app/uploads/avatars/${
+      fileObj._id
+    }-${fileObj.name()}`;
     const newFileName = fileObj.name();
 
     // This is "example" variable, change it to the userId that you might be using.