diff --git a/server/utils/s3.js b/server/utils/s3.js
index 7edeb384..ffe4867c 100644
--- a/server/utils/s3.js
+++ b/server/utils/s3.js
@@ -37,15 +37,18 @@ export const signPolicy = (policy: any) => {
   return signature;
 };
 
-export const publicS3Endpoint = () => {
+export const publicS3Endpoint = (isServerUpload?: boolean) => {
   // lose trailing slash if there is one and convert fake-s3 url to localhost
   // for access outside of docker containers in local development
+  const isDocker = process.env.AWS_S3_UPLOAD_BUCKET_URL.match(/http:\/\/s3:/);
   const host = process.env.AWS_S3_UPLOAD_BUCKET_URL.replace(
     's3:',
     'localhost:'
   ).replace(/\/$/, '');
 
-  return `${host}/${process.env.AWS_S3_UPLOAD_BUCKET_NAME}`;
+  return `${host}/${isServerUpload && isDocker ? 's3/' : ''}${
+    process.env.AWS_S3_UPLOAD_BUCKET_NAME
+  }`;
 };
 
 export const uploadToS3FromUrl = async (url: string, key: string) => {
@@ -73,7 +76,7 @@ export const uploadToS3FromUrl = async (url: string, key: string) => {
       })
       .promise();
 
-    const endpoint = publicS3Endpoint();
+    const endpoint = publicS3Endpoint(true);
     return `${endpoint}/${key}`;
   } catch (err) {
     if (process.env.NODE_ENV === 'production') {