diff --git a/modules/bookshelf/module.json b/modules/bookshelf/module.json
index 4447e4b..49441d8 100644
--- a/modules/bookshelf/module.json
+++ b/modules/bookshelf/module.json
@@ -39,10 +39,15 @@
       "path": "/var/lib/mesh/bookshelf",
       "mode": "0700"
     },
+    {
+      "id": "state",
+      "type": "directory",
+      "mode": "0700",
+      "place": "."
+    },
     {
       "id": "config",
       "type": "directory",
-      "path": "/services/bookshelf/config",
       "mode": "0700",
       "owner": "1000:1000"
     },
@@ -50,7 +55,7 @@
       "id": "server",
       "type": "container",
       "name": "bookshelf",
-      "image": "ghcr.io/pennydreadful/bookshelf@sha256:388eecc94362580eae31ee0a454be6af516f8a311f8432a521c202fb475f4359",
+      "image": "ghcr.io/pennydreadful/bookshelf@sha256:67498dd5ece516867d72ee642abd6c1a66b36a135c8f7da0127109564372beb1",
       "env": {
         "PUID": "1000",
         "PGID": "1000",
@@ -60,7 +65,7 @@
         "8787"
       ],
       "volumes": [
-        "/services/bookshelf/config:/config",
+        "${dir:config}:/config",
         "/services/media/books:/books",
         "/services/media/downloads:/downloads"
       ]
@@ -72,11 +77,11 @@
       "network": "host",
       "volumes": [
         "/var/lib/mesh/bookshelf/broker:/run/secrets/broker:ro",
-        "/services/bookshelf/config:/var/lib/bookshelf/config:ro"
+        "${dir:config}:/var/lib/bookshelf/config:ro"
       ],
       "env": {
         "MESH_BROKER_FILE": "/run/secrets/broker",
-        "MESH_BOOKSHELF_URL": "http://127.0.0.1:8787",
+        "MESH_BOOKSHELF_URL": "http://127.0.0.1:${port:8787}",
         "MESH_BOOKSHELF_CONFIG_DIR": "/var/lib/bookshelf/config"
       },
       "artifact": "runtime"
@@ -92,7 +97,7 @@
     }
   },
   "binds": {
-    "route": "/var/lib/mesh/bookshelf/route.json"
+    "route": "${dir:state}/route.json"
   },
   "build": {
     "on": [