diff --git a/README.md b/README.md
index 526735f..585b193 100644
--- a/README.md
+++ b/README.md
@@ -85,13 +85,17 @@ What you need to do in Keycloak
    - Client ID: peertube
 4. On the next page:
    - Client authentication: ON
-   - Valid redirect URIs: https://peertube.chatons.duckdns.org/plugins/auth-openid-connect/0.0.1/auth/openid-connect/callback
+   - Valid redirect URIs: https://peertube.chatons.duckdns.org/plugins/auth-openid-connect/router/code-cb
    - Web origins: https://peertube.chatons.duckdns.org
 5. Save, go to Credentials tab, copy the Client Secret
 6. Paste it in core/peertube/.env replacing REPLACE_WITH_KEYCLOAK_CLIENT_SECRET
 Then you also need to install the auth-openid-connect plugin in PeerTube:
 - Go to PeerTube Admin > Plugins > search for auth-openid-connect > Install
 
+## bookstack
+- Email: admin@admin.com
+- Password: password
+
 
 ```
 
diff --git a/core/bookstack/compose.yml b/core/bookstack/compose.yml
new file mode 100644
index 0000000..6d0583a
--- /dev/null
+++ b/core/bookstack/compose.yml
@@ -0,0 +1,55 @@
+services:
+  bookstack:
+    image: lscr.io/linuxserver/bookstack:latest
+    container_name: bookstack
+    env_file:
+      - runtime.env
+    expose:
+      - "6875"
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - DB_HOST=bookstack-db
+      - DB_PORT=3306
+      - DB_USERNAME=bookstack
+      - DB_DATABASE=bookstack
+    volumes:
+      - bookstack-data:/config
+    depends_on:
+      - db
+    networks:
+      - proxy
+    restart: unless-stopped
+    security_opt:
+      - no-new-privileges:true
+
+  db:
+    image: mariadb:10.11
+    container_name: bookstack-db
+    read_only: true
+    env_file:
+      - runtime.env
+    environment:
+      - MYSQL_DATABASE=bookstack
+      - MYSQL_USER=bookstack
+    volumes:
+      - mariadb-data:/var/lib/mysql
+    tmpfs:
+      - /tmp
+      - /run/mysqld
+    networks:
+      - proxy
+    restart: unless-stopped
+    security_opt:
+      - no-new-privileges:true
+
+volumes:
+  bookstack-data:
+    name: bookstack-data
+  mariadb-data:
+    name: mariadb-data
+
+networks:
+  proxy:
+    name: proxy
+    external: true
diff --git a/core/bookstack/runtime.env b/core/bookstack/runtime.env
new file mode 100644
index 0000000..4dc7a84
--- /dev/null
+++ b/core/bookstack/runtime.env
@@ -0,0 +1,6 @@
+TZ=UTC
+APP_URL=https://bookstack.chatons.duckdns.org
+DB_PASSWORD=secure_bookstack_password
+MYSQL_PASSWORD=secure_bookstack_password
+MYSQL_ROOT_PASSWORD=secure_root_password
+APP_KEY=base64:wFxqmYcKSa6Wf+zYkXPMGXQHtyg5M3D7x90jginkizY=
diff --git a/core/caddy/config/sites/bookstack.caddy b/core/caddy/config/sites/bookstack.caddy
new file mode 100644
index 0000000..8f35489
--- /dev/null
+++ b/core/caddy/config/sites/bookstack.caddy
@@ -0,0 +1,3 @@
+bookstack.chatons.duckdns.org {
+    reverse_proxy bookstack:80
+}
\ No newline at end of file
diff --git a/startup b/startup
index 73a3d9e..74de6f4 100755
--- a/startup
+++ b/startup
@@ -30,6 +30,7 @@ case "$1" in
 		just start keycloak
 		just start git
 		just start peertube
+		just start bookstack
 	;;
 	down)
 		just down nextcloud
@@ -40,6 +41,7 @@ case "$1" in
 		just down keycloak
 		just down git
 		just down peertube
+		just down bookstack
 	;;
 	clean)
 		just clean nextcloud
@@ -50,17 +52,18 @@ case "$1" in
 		just clean keycloak
 		just clean git
 		just clean peertube
+		just clean bookstack
 	;;
 	restart)
 		just clean nextcloud
-		just clean caddy
+		#just clean caddy
 		#just re duckdns
 		just start nextcloud
-		just start caddy
-		just re peertube
+		#just start caddy
+		#just re peertube
 		just re doh
 		just re postgresql
 		just re git
-		just re keycloak
+		#just re keycloak
 	;;
 esac
\ No newline at end of file