diff --git a/install/knot.conf b/install/knot.conf
index fa30a14..874e280 100644
--- a/install/knot.conf
+++ b/install/knot.conf
@@ -26,11 +26,19 @@ template:
     journal-content: "all"
     dnssec-signing: "on"
     dnssec-policy: "servnest"
+    catalog-role: "member"
+    catalog-zone: "servnest.test.invalid."
 
 zone:
+  - domain: "servnest.test.invalid."
+    zonefile-load: "whole"
+    journal-content: "all"
+    catalog-role: "generate"
+
   - domain: "servnest.test."
     template: "servnest"
     storage: "/srv/servnest/reg"
+
   - domain: "test.servnest.test."
     template: "servnest"
     storage: "/srv/servnest/reg"
diff --git a/install/knot.sh b/install/knot.sh
index 659c925..d33fdd2 100644
--- a/install/knot.sh
+++ b/install/knot.sh
@@ -10,10 +10,6 @@ usermod -aG $knot $servnest # Add user $servnest to group $knot
 chown -R $knot: /var/lib/knot/confdb
 chmod -R u=rwX,g=rwX,o= /var/lib/knot/confdb
 
-mkdir -p /srv/servnest/reg
-chown -R $servnest:$knot /srv/servnest/reg
-chmod -R u=rwX,g=rwX,o= /srv/servnest/reg
-
-mkdir /srv/servnest/ns
-chown -R $servnest:$knot /srv/servnest/ns
-chmod -R u=rwX,g=rwX,o= /srv/servnest/ns
+mkdir -p /srv/servnest/reg /srv/servnest/ns
+chown -R $servnest:$knot /srv/servnest/reg /srv/servnest/ns
+chmod -R u=rwX,g=rwX,o= /srv/servnest/reg /srv/servnest/ns
diff --git a/install/servnest.sh b/install/servnest.sh
index 35f3e62..a39314c 100644
--- a/install/servnest.sh
+++ b/install/servnest.sh
@@ -13,7 +13,8 @@ done
 # Create translation Machine Objects files
 msgfmt /srv/servnest/core/locales/fr/C/LC_MESSAGES/messages.po -o /srv/servnest/core/locales/fr/C/LC_MESSAGES/messages.mo
 
-chown -R $servnest:$nginx /srv/servnest/core
-chmod -R u=rX,g=rX,o= /srv/servnest/core
+chmod -R u=rX,g=rX,o= $(find /srv/servnest/core -mindepth 1 -maxdepth 1 ! -name .git ! -name db)
+chown -R $servnest:$nginx $(find /srv/servnest/core -mindepth 1 -maxdepth 1 ! -name .git ! -name db)
+
 chown -R $servnest: /srv/servnest/core/db
 chmod -R u=rwX,g=,o= /srv/servnest/core/db
diff --git a/srv/servnest/core b/srv/servnest/core
index 13bfd8e..25b1d30 160000
--- a/srv/servnest/core
+++ b/srv/servnest/core
@@ -1 +1 @@
-Subproject commit 13bfd8e9bef4814904ef7a642411fa43f4253df4
+Subproject commit 25b1d30cbebef6bde5bb26b4de92ef78a29924a6