diff --git a/package.json b/package.json
index 6a64abdc..91c416c6 100644
--- a/package.json
+++ b/package.json
@@ -83,13 +83,14 @@
     "clean:light": "rm -rf dist/*",
     "prepare": "npm run clean && npm run build",
     "build:converse": "bash conversejs/build-conversejs.sh",
-    "build:images": "mkdir -p dist/client/images && npx svgo -f public/images/ -o dist/client/images/ && npx svgo -f public/images/avatars/ -o dist/server/avatars/",
+    "build:images": "mkdir -p dist/client/images && npx svgo -f public/images/ -o dist/client/images/",
+    "build:avatars": "mkdir -p dist/server/avatars && npx svgo -f public/images/avatars/ -o dist/server/avatars/",
     "build:webpack": "webpack --mode=production",
     "build:server": "npx tsc --build server/tsconfig.json",
     "build:serverconverse": "mkdir -p dist/server/conversejs && cp conversejs/index.html dist/server/conversejs/",
     "build:prosodymodules": "mkdir -p dist/server/prosody-modules && cp -r prosody-modules/* dist/server/prosody-modules/",
     "build:styles": "sass assets:dist/assets",
-    "build": "npm-run-all -s clean:light -p build:converse build:images build:webpack build:server build:serverconverse build:prosodymodules build:styles",
+    "build": "npm-run-all -s clean:light -p build:converse build:images build:avatars build:webpack build:server build:serverconverse build:prosodymodules build:styles",
     "lint": "npm-run-all -s lint:script lint:styles",
     "lint:script": "npx eslint --ext .js --ext .ts .",
     "lint:styles": "stylelint 'conversejs/**/*.scss' 'assets/**/*.css'",