diff --git a/zim/library/backend.yaml b/zim/library/backend.yaml
index 896bc55..0adbf11 100644
--- a/zim/library/backend.yaml
+++ b/zim/library/backend.yaml
@@ -3,23 +3,23 @@ kind: Deployment
 metadata:
   namespace: zim
   labels:
-    app: library-demo-backend-app
-  name: library-demo-backend-deployment
+    app: library-data-backend-app
+  name: library-data-backend-deployment
 spec:
   replicas: 2
   selector:
     matchLabels:
-      app: library-demo-backend-app
+      app: library-data-backend-app
   template:
     metadata:
       labels:
-        app: library-demo-backend-app
+        app: library-data-backend-app
     spec:
       containers:
       # /!\ manually purge kiwix-serve cache on kiwix-serve version upgrade
       # curl -X PURGE -H "X-Purge-Type: kiwix-serve" http://library-frontend-service
       # also check that varnish hack still necessary (gzip, endpoints)
-      - image: ghcr.io/kiwix/kiwix-tools:3.5.0-2
+      - image: ghcr.io/kiwix/kiwix-tools:3.6.0
         imagePullPolicy: IfNotPresent
         name: kiwix-tools
         args: ["kiwix-serve", "--library", "-v", "--monitorLibrary", "--threads", "16", "--searchLimit", "5", "--nodatealias", "/data/library/internal_library.xml"]
@@ -61,12 +61,12 @@ apiVersion: v1
 kind: Service
 metadata:
   namespace: zim
-  name: library-demo-backend-service
+  name: library-data-backend-service
   labels:
-    app: library-demo-backend-app
+    app: library-data-backend-app
 spec:
   selector:
-    app: library-demo-backend-app
+    app: library-data-backend-app
   ports:
   - protocol: TCP
     port: 80
@@ -92,7 +92,7 @@ spec:
     spec:
       containers:
         # /!\ manually purge kiwix-serve cache on kiwix-serve version upgrade
-      - image: ghcr.io/kiwix/kiwix-tools:3.5.0-2
+      - image: ghcr.io/kiwix/kiwix-tools:3.6.0
         imagePullPolicy: IfNotPresent
         name: kiwix-tools
         args: ["kiwix-serve", "--library", "-v", "--monitorLibrary", "--threads", "16", "--searchLimit", "5", "--nodatealias", "/data/library/internal_library.xml"]
diff --git a/zim/library/frontend.yaml b/zim/library/frontend.yaml
index 2def515..992f939 100644
--- a/zim/library/frontend.yaml
+++ b/zim/library/frontend.yaml
@@ -61,9 +61,9 @@ data:
       "100.64.0.0"/16; // k8s cluster
     }
 
-    # demo backend (HTML) is first (and thus default)
-    backend demo {
-        .host = "library-demo-backend-service";
+    # data backend (HTML) is first (and thus default)
+    backend data {
+        .host = "library-data-backend-service";
         .port = "80";
 
         # .connect_timeout = 60s;
@@ -158,7 +158,7 @@ data:
       if (req.url ~ "^/catalog/") {
           set req.backend_hint = catalog;
       } else {
-          set req.backend_hint = demo;
+          set req.backend_hint = data;
       }
 
       # TEMP: disabling cache until https://github.com/kiwix/libkiwix/issues/995