diff --git a/.env b/.env
index 0d206aa..2b7e155 100644
--- a/.env
+++ b/.env
@@ -55,4 +55,6 @@ GRAFANA_INTERNAL_PORT=3000
 STASH_EXTERNAL_PORT=9998
 STASH_INTERNAL_PORT=9999
 NAVIDROME_EXTERNAL_PORT=4533
-NAVIDROME_INTERNAL_PORT=4533
\ No newline at end of file
+NAVIDROME_INTERNAL_PORT=4533
+MALOJA_EXTERNAL_PORT=42010
+MALOJA_INTERNAL_PORT=42010
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index d0cd289..5dccb11 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -487,6 +487,17 @@ services:
       - base
     restart: unless-stopped
 
+  maloja:
+    image: krateng/maloja
+    container_name: maloja
+    ports:
+      - "${MALOJA_EXTERNAL_PORT}:${MALOJA_INTERNAL_PORT}"
+    env_file:
+      - maloja.env
+    user: "${PUID}:${PGID}"
+    volumes:
+      - "${DOCKER_STORAGE_PATH}/maloja:/data"
+
 networks:
   loki:
   caddy:
diff --git a/maloja.env b/maloja.env
new file mode 100644
index 0000000..23d38d1
--- /dev/null
+++ b/maloja.env
@@ -0,0 +1,2 @@
+MALOJA_DATA_DIRECTORY=/data
+MALOJA_FORCE_PASSWORD=kralovna
\ No newline at end of file