diff --git a/server/api/helpers/attachments/process-uploaded-file.js b/server/api/helpers/attachments/process-uploaded-file.js
index 61defb7b..e4779698 100644
--- a/server/api/helpers/attachments/process-uploaded-file.js
+++ b/server/api/helpers/attachments/process-uploaded-file.js
@@ -26,7 +26,7 @@ module.exports = {
     fs.mkdirSync(rootPath);
     await moveFile(inputs.file.fd, filePath);
 
-    const image = sharp(filePath, {
+    let image = sharp(filePath, {
       animated: true,
     });
 
@@ -46,7 +46,11 @@ module.exports = {
       const thumbnailsPath = path.join(rootPath, 'thumbnails');
       fs.mkdirSync(thumbnailsPath);
 
-      const { width, pageHeight: height = metadata.height } = metadata;
+      let { width, pageHeight: height = metadata.height } = metadata;
+      if (metadata.orientation && metadata.orientation > 4) {
+        [image, width, height] = [image.rotate(), height, width];
+      }
+
       const isPortrait = height > width;
       const thumbnailsExtension = metadata.format === 'jpeg' ? 'jpg' : metadata.format;
 
diff --git a/server/api/helpers/projects/process-uploaded-background-image-file.js b/server/api/helpers/projects/process-uploaded-background-image-file.js
index ebec3e4f..70792a03 100644
--- a/server/api/helpers/projects/process-uploaded-background-image-file.js
+++ b/server/api/helpers/projects/process-uploaded-background-image-file.js
@@ -17,7 +17,7 @@ module.exports = {
   },
 
   async fn(inputs) {
-    const image = sharp(inputs.file.fd, {
+    let image = sharp(inputs.file.fd, {
       animated: true,
     });
 
@@ -37,7 +37,11 @@ module.exports = {
 
     fs.mkdirSync(rootPath);
 
-    const { width, pageHeight: height = metadata.height } = metadata;
+    let { width, pageHeight: height = metadata.height } = metadata;
+    if (metadata.orientation && metadata.orientation > 4) {
+      [image, width, height] = [image.rotate(), height, width];
+    }
+
     const extension = metadata.format === 'jpeg' ? 'jpg' : metadata.format;
 
     try {
diff --git a/server/api/helpers/users/process-uploaded-avatar-file.js b/server/api/helpers/users/process-uploaded-avatar-file.js
index 40300573..23058412 100644
--- a/server/api/helpers/users/process-uploaded-avatar-file.js
+++ b/server/api/helpers/users/process-uploaded-avatar-file.js
@@ -17,7 +17,7 @@ module.exports = {
   },
 
   async fn(inputs) {
-    const image = sharp(inputs.file.fd, {
+    let image = sharp(inputs.file.fd, {
       animated: true,
     });
 
@@ -37,7 +37,11 @@ module.exports = {
 
     fs.mkdirSync(rootPath);
 
-    const { width, pageHeight: height = metadata.height } = metadata;
+    let { width, pageHeight: height = metadata.height } = metadata;
+    if (metadata.orientation && metadata.orientation > 4) {
+      [image, width, height] = [image.rotate(), height, width];
+    }
+
     const extension = metadata.format === 'jpeg' ? 'jpg' : metadata.format;
 
     try {
diff --git a/server/db/migrations/20221226210239_improve_quality_of_resized_images.js b/server/db/migrations/20221226210239_improve_quality_of_resized_images.js
index cfa96ca0..fed01d40 100644
--- a/server/db/migrations/20221226210239_improve_quality_of_resized_images.js
+++ b/server/db/migrations/20221226210239_improve_quality_of_resized_images.js
@@ -6,7 +6,7 @@ const getConfig = require('../../get-config');
 const processUserAvatar = async (user, userAvatarsPath) => {
   const rootPath = path.join(userAvatarsPath, user.avatar.dirname);
 
-  const image = sharp(path.join(rootPath, `original.${user.avatar.extension}`), {
+  let image = sharp(path.join(rootPath, `original.${user.avatar.extension}`), {
     animated: true,
   });
 
@@ -17,7 +17,10 @@ const processUserAvatar = async (user, userAvatarsPath) => {
     return;
   }
 
-  const { width, pageHeight: height = metadata.height } = metadata;
+  let { width, pageHeight: height = metadata.height } = metadata;
+  if (metadata.orientation && metadata.orientation > 4) {
+    [image, width, height] = [image.rotate(), height, width];
+  }
 
   try {
     await image
@@ -37,7 +40,7 @@ const processUserAvatar = async (user, userAvatarsPath) => {
 const processProjectBackgroundImage = async (project, projectBackgroundImagesPath) => {
   const rootPath = path.join(projectBackgroundImagesPath, project.background_image.dirname);
 
-  const image = sharp(path.join(rootPath, `original.${project.background_image.extension}`), {
+  let image = sharp(path.join(rootPath, `original.${project.background_image.extension}`), {
     animated: true,
   });
 
@@ -48,7 +51,10 @@ const processProjectBackgroundImage = async (project, projectBackgroundImagesPat
     return;
   }
 
-  const { width, pageHeight: height = metadata.height } = metadata;
+  let { width, pageHeight: height = metadata.height } = metadata;
+  if (metadata.orientation && metadata.orientation > 4) {
+    [image, width, height] = [image.rotate(), height, width];
+  }
 
   try {
     await image
@@ -69,7 +75,7 @@ const processAttachmentImage = async (attachment, attachmentsPath) => {
   const rootPath = path.join(attachmentsPath, attachment.dirname);
   const thumbnailsPath = path.join(rootPath, 'thumbnails');
 
-  const image = sharp(path.join(rootPath, attachment.filename), {
+  let image = sharp(path.join(rootPath, attachment.filename), {
     animated: true,
   });
 
@@ -80,7 +86,11 @@ const processAttachmentImage = async (attachment, attachmentsPath) => {
     return;
   }
 
-  const { width, pageHeight: height = metadata.height } = metadata;
+  let { width, pageHeight: height = metadata.height } = metadata;
+  if (metadata.orientation && metadata.orientation > 4) {
+    [image, width, height] = [image.rotate(), height, width];
+  }
+
   const isPortrait = height > width;
 
   try {