diff --git a/core/src/main/java/com/predic8/membrane/core/cli/RouterCLI.java b/core/src/main/java/com/predic8/membrane/core/cli/RouterCLI.java
index ca6dc59884..a5781238c3 100644
--- a/core/src/main/java/com/predic8/membrane/core/cli/RouterCLI.java
+++ b/core/src/main/java/com/predic8/membrane/core/cli/RouterCLI.java
@@ -165,6 +165,7 @@ private static Router initRouterByYAML(String location) throws Exception {
 
         GrammarAutoGenerated grammar = new GrammarAutoGenerated();
         BeanRegistryImplementation reg = new BeanRegistryImplementation(grammar);
+        router.setRegistry(reg);
         reg.register("router", router);
 
         getConfigDefinition(reg.parseYamlBeanDefinitions(router.getResolverMap().resolve(location), grammar))
diff --git a/core/src/main/java/com/predic8/membrane/core/kubernetes/KubernetesWatcher.java b/core/src/main/java/com/predic8/membrane/core/kubernetes/KubernetesWatcher.java
index 161b39c709..329839f762 100644
--- a/core/src/main/java/com/predic8/membrane/core/kubernetes/KubernetesWatcher.java
+++ b/core/src/main/java/com/predic8/membrane/core/kubernetes/KubernetesWatcher.java
@@ -17,7 +17,6 @@
 import com.predic8.membrane.annot.beanregistry.AsyncBeanCollector;
 import com.predic8.membrane.annot.beanregistry.BeanCollector;
 import com.predic8.membrane.annot.beanregistry.BeanDefinition;
-import com.predic8.membrane.annot.beanregistry.BeanRegistryImplementation;
 import com.predic8.membrane.annot.yaml.*;
 import com.predic8.membrane.core.config.spring.*;
 import com.predic8.membrane.core.interceptor.kubernetes.*;
@@ -47,9 +46,9 @@ public class KubernetesWatcher {
     public KubernetesWatcher(DefaultRouter router) {
         this.router = router;
         this.grammar = new GrammarAutoGenerated();
-        var br = new BeanRegistryImplementation(grammar);
+        var br = router.getRegistry();
         br.register("router", router);
-        this.beanRegistry = new AsyncBeanCollector(br);
+        this.beanRegistry = new AsyncBeanCollector((BeanCollector) br);
     }
 
     public void start() {
diff --git a/distribution/src/test/java/com/predic8/membrane/tutorials/advanced/PathParameterRoutingTutorialTest.java b/distribution/src/test/java/com/predic8/membrane/tutorials/advanced/PathParameterRoutingTutorialTest.java
index df772be07f..da710889ea 100644
--- a/distribution/src/test/java/com/predic8/membrane/tutorials/advanced/PathParameterRoutingTutorialTest.java
+++ b/distribution/src/test/java/com/predic8/membrane/tutorials/advanced/PathParameterRoutingTutorialTest.java
@@ -33,10 +33,10 @@ void pathParameterRouting() {
         // @formatter:off
         given()
         .when()
-            .get("http://localhost:2000/fruits/7")
+            .get("http://localhost:2000/fruits/12")
         .then()
             .statusCode(200)
-            .body("id", equalTo(7))
+            .body("id", equalTo(12))
             .body("name",  notNullValue())
             .body("modified_at", notNullValue());
         // @formatter:on
diff --git a/distribution/src/test/java/com/predic8/membrane/tutorials/advanced/PathRewritingTutorialTest.java b/distribution/src/test/java/com/predic8/membrane/tutorials/advanced/PathRewritingTutorialTest.java
index a0f676d72f..c0b36a8090 100644
--- a/distribution/src/test/java/com/predic8/membrane/tutorials/advanced/PathRewritingTutorialTest.java
+++ b/distribution/src/test/java/com/predic8/membrane/tutorials/advanced/PathRewritingTutorialTest.java
@@ -43,10 +43,10 @@ void consoleLogs() {
                 // @formatter:off
                 given()
                 .when()
-                    .get("http://localhost:2000/fruits/7")
+                    .get("http://localhost:2000/fruits/12")
                 .then()
                     .statusCode(200)
-                    .body("id", equalTo(7))
+                    .body("id", equalTo(12))
                     .body("name",  notNullValue())
                     .body("modified_at", notNullValue());
                 // @formatter:on
@@ -57,8 +57,8 @@ void consoleLogs() {
             String console = out.toString();
             System.out.println(console);
             assertTrue(console.contains("INFO LogInterceptor"));
-            assertTrue(console.contains("Requested /fruits/7"));
-            assertTrue(console.contains("Rewritten /shop/v2/products/7"));
+            assertTrue(console.contains("Requested /fruits/12"));
+            assertTrue(console.contains("Rewritten /shop/v2/products/12"));
         }
     }
 }
\ No newline at end of file
diff --git a/distribution/tutorials/advanced/20-Path-Parameter-Routing.yaml b/distribution/tutorials/advanced/20-Path-Parameter-Routing.yaml
index 14241feb58..6280ac24b4 100644
--- a/distribution/tutorials/advanced/20-Path-Parameter-Routing.yaml
+++ b/distribution/tutorials/advanced/20-Path-Parameter-Routing.yaml
@@ -5,7 +5,7 @@
 #
 # Try:
 #
-#   curl http://localhost:2000/fruits/7
+#   curl http://localhost:2000/fruits/12
 
 api:
   port: 2000
diff --git a/distribution/tutorials/advanced/30-Path-Rewriting.yaml b/distribution/tutorials/advanced/30-Path-Rewriting.yaml
index b753f2056d..9c86510293 100644
--- a/distribution/tutorials/advanced/30-Path-Rewriting.yaml
+++ b/distribution/tutorials/advanced/30-Path-Rewriting.yaml
@@ -5,7 +5,7 @@
 #
 # Try:
 #
-#   curl http://localhost:2000/fruits/7
+#   curl http://localhost:2000/fruits/12
 #
 # Observe the log output.