diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4273994a..d86aa0ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Minor changes and fixes
 
 * Updating a link to the documentation in the settings page.
+* Moving `public/images` dir to `assets/images`, because it conflicts with gitlab CI/CD for documentation. Moving `assets/styles.css` to `assets/styles/styles.css`.
 
 ## 6.1.0
 
diff --git a/public/images/avatars/1.svg b/assets/images/avatars/1.svg
similarity index 100%
rename from public/images/avatars/1.svg
rename to assets/images/avatars/1.svg
diff --git a/public/images/avatars/10.svg b/assets/images/avatars/10.svg
similarity index 100%
rename from public/images/avatars/10.svg
rename to assets/images/avatars/10.svg
diff --git a/public/images/avatars/2.svg b/assets/images/avatars/2.svg
similarity index 100%
rename from public/images/avatars/2.svg
rename to assets/images/avatars/2.svg
diff --git a/public/images/avatars/3.svg b/assets/images/avatars/3.svg
similarity index 100%
rename from public/images/avatars/3.svg
rename to assets/images/avatars/3.svg
diff --git a/public/images/avatars/4.svg b/assets/images/avatars/4.svg
similarity index 100%
rename from public/images/avatars/4.svg
rename to assets/images/avatars/4.svg
diff --git a/public/images/avatars/5.svg b/assets/images/avatars/5.svg
similarity index 100%
rename from public/images/avatars/5.svg
rename to assets/images/avatars/5.svg
diff --git a/public/images/avatars/6.svg b/assets/images/avatars/6.svg
similarity index 100%
rename from public/images/avatars/6.svg
rename to assets/images/avatars/6.svg
diff --git a/public/images/avatars/7.svg b/assets/images/avatars/7.svg
similarity index 100%
rename from public/images/avatars/7.svg
rename to assets/images/avatars/7.svg
diff --git a/public/images/avatars/8.svg b/assets/images/avatars/8.svg
similarity index 100%
rename from public/images/avatars/8.svg
rename to assets/images/avatars/8.svg
diff --git a/public/images/avatars/9.svg b/assets/images/avatars/9.svg
similarity index 100%
rename from public/images/avatars/9.svg
rename to assets/images/avatars/9.svg
diff --git a/public/images/bye.svg b/assets/images/bye.svg
similarity index 100%
rename from public/images/bye.svg
rename to assets/images/bye.svg
diff --git a/public/images/logo.svg b/assets/images/logo.svg
similarity index 100%
rename from public/images/logo.svg
rename to assets/images/logo.svg
diff --git a/public/images/new-window.svg b/assets/images/new-window.svg
similarity index 100%
rename from public/images/new-window.svg
rename to assets/images/new-window.svg
diff --git a/public/images/talking-new-window.svg b/assets/images/talking-new-window.svg
similarity index 100%
rename from public/images/talking-new-window.svg
rename to assets/images/talking-new-window.svg
diff --git a/public/images/talking.svg b/assets/images/talking.svg
similarity index 100%
rename from public/images/talking.svg
rename to assets/images/talking.svg
diff --git a/public/images/url.svg b/assets/images/url.svg
similarity index 100%
rename from public/images/url.svg
rename to assets/images/url.svg
diff --git a/assets/style.scss b/assets/styles/style.scss
similarity index 100%
rename from assets/style.scss
rename to assets/styles/style.scss
diff --git a/build-avatars.js b/build-avatars.js
index 489f6724..1764051e 100755
--- a/build-avatars.js
+++ b/build-avatars.js
@@ -4,7 +4,7 @@
 const sharp = require('sharp')
 const path = require('path')
 
-const inputDir = './public/images/avatars/'
+const inputDir = './assets/images/avatars/'
 const outputDir = './dist/server/avatars/'
 const backgrounds = [
   '#ffffff',
diff --git a/client/videowatch/buttons.ts b/client/videowatch/buttons.ts
index b0e400dd..09e794fc 100644
--- a/client/videowatch/buttons.ts
+++ b/client/videowatch/buttons.ts
@@ -2,7 +2,7 @@
 type SVGButton = () => string
 
 const closeSVG: SVGButton = () => {
-  // This content comes from the file public/image/bye.svg, after svgo cleaning.
+  // This content comes from the file assets/images/bye.svg, after svgo cleaning.
   // To get the formated content, you can do:
   // xmllint dist/client/images/bye.svg --format
   // Then replace the main color by «currentColor»
@@ -25,7 +25,7 @@ const closeSVG: SVGButton = () => {
 }
 
 const openChatSVG: SVGButton = () => {
-  // This content comes from the file public/image/talking.svg, after svgo cleaning.
+  // This content comes from the file assets/images/talking.svg, after svgo cleaning.
   // To get the formated content, you can do:
   // xmllint dist/client/images/talking.svg --format
   // Note: it was highly simplified in this file.
@@ -43,7 +43,7 @@ const openChatSVG: SVGButton = () => {
 }
 
 const openBlankChatSVG: SVGButton = () => {
-  // This content comes from the file public/image/new-window.svg, after svgo cleaning.
+  // This content comes from the file assets/images/new-window.svg, after svgo cleaning.
   // To get the formated content, you can do:
   // xmllint dist/client/images/new-window.svg --format
   // Then replace the main color by «currentColor»
@@ -86,7 +86,7 @@ const openBlankChatSVG: SVGButton = () => {
 }
 
 const shareChatUrlSVG: SVGButton = () => {
-  // This content comes from the file public/image/url.svg, after svgo cleaning.
+  // This content comes from the file assets/images/url.svg, after svgo cleaning.
   // To get the formated content, you can do:
   // xmllint dist/client/images/url.svg --format
   // Then replace the color by `currentColor`
diff --git a/package.json b/package.json
index f47958fd..42fd8b36 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     }
   ],
   "css": [
-    "dist/assets/style.css"
+    "dist/assets/styles/style.css"
   ],
   "dependencies": {
     "async": "^3.2.2",
@@ -86,18 +86,18 @@
     "prepare": "npm run clean && npm run build",
     "build:converse": "bash conversejs/build-conversejs.sh",
     "build:prosody": "bash build-prosody.sh",
-    "build:images": "mkdir -p dist/client/images && npx svgo -f public/images/ -o dist/client/images/",
+    "build:images": "mkdir -p dist/client/images && npx svgo -f assets/images/ -o dist/client/images/",
     "build:avatars": "mkdir -p dist/server/avatars && ./build-avatars.js",
     "check:client:tsc": "npx tsc --p client/ --noEmit --skipLibCheck",
     "build:client": "node ./build-client.js --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:styles": "sass assets/styles:dist/assets/styles",
     "build": "npm-run-all -s clean:light check:client:tsc -p build:converse build:prosody build:images build:avatars build:client 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'",
+    "lint:styles": "stylelint 'conversejs/**/*.scss' 'assets/styles/**/*.css'",
     "show:npmfiles": "npx npm-packlist",
     "doc:generatemissingtranslations": "bash doc-generate-missing-translations.sh"
   },