diff --git a/assets/images/favicon.ico b/assets/images/favicon.ico
new file mode 100644
index 0000000..199bbcd
Binary files /dev/null and b/assets/images/favicon.ico differ
diff --git a/exercise_solutions/compose/mattermost/.env b/exercise_solutions/compose/mattermost/.env
new file mode 100644
index 0000000..3c3113b
--- /dev/null
+++ b/exercise_solutions/compose/mattermost/.env
@@ -0,0 +1,4 @@
+MATTERMOST_DB_USER=mattermost
+MATTERMOST_DB=mattermost
+MATTERMOST_DB_PASSWORD=mattermost
+
diff --git a/exercise_solutions/compose/mattermost/mattermost-compose.yaml b/exercise_solutions/compose/mattermost/mattermost-compose.yaml
new file mode 100644
index 0000000..d40bab0
--- /dev/null
+++ b/exercise_solutions/compose/mattermost/mattermost-compose.yaml
@@ -0,0 +1,42 @@
+services:
+
+  mattermost:
+    container_name: mattermost
+    image: mattermost/mattermost-team-edition
+    ports:
+      - "8065:8065"
+    environment:
+      - MM_USERNAME=${MATTERMOST_DB_USER}
+      - MM_SQLSETTINGS_DRIVERNAME=mysql
+      - MM_SQLSETTINGS_DATASOURCE=${MATTERMOST_DB_USER}:${MATTERMOST_DB_PASSWORD}@tcp(mysql-mattermost:3306)/mattermost?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s
+      - MM_PASSWORD=${MATTERMOST_DB_PASSWORD}
+      - MM_DBNAME=${MATTERMOST_DB}
+      - DB_PORT_PORT_NUMBER=3306
+      - DB_HOST=mysql-mattermost
+    depends_on:
+      - mysql-mattermost
+    volumes:
+      - mattermost_data:/mattermost/data:rw
+      - mattermost_config:/mattermost/config:rw
+      - mattermost_plugins:/mattermost/plugins:rw
+      - mattermost_logs:/mattermost/logs:rw
+
+  mysql-mattermost:
+    image: mysql:latest
+    container_name: mysql-mattermost
+    environment:
+    - TZ=Europe/Rome
+    - MYSQL_USER=${MATTERMOST_DB_USER}
+    - MYSQL_ROOT_PASSWORD=rootpassword
+    - MYSQL_PASSWORD=${MATTERMOST_DB_PASSWORD}
+    - MYSQL_DATABASE=${MATTERMOST_DB}
+    volumes:
+      - mysql-mattermost:/var/lib/mysql
+
+volumes:
+  mattermost_data:
+  mattermost_config:
+  mattermost_logs:
+  mattermost_plugins:
+  mysql-mattermost:
+