diff --git a/geant/gap_ansible/roles/bc_templates/routers/nokia/general.j2 b/geant/gap_ansible/roles/bc_templates/routers/nokia/general.j2
index 5efc56652bb8d0b8d224e6bec17d4e11d90f657d..7a4d302789603a73fa89df0c23fff476bb3f0796 100644
--- a/geant/gap_ansible/roles/bc_templates/routers/nokia/general.j2
+++ b/geant/gap_ansible/roles/bc_templates/routers/nokia/general.j2
@@ -10,6 +10,13 @@
         <lsr-load-balancing>lbl-ip-l4-teid</lsr-load-balancing>
         <system-ip-load-balancing>true</system-ip-load-balancing>
     </load-balancing>
+    <grpc>
+        <admin-state>enable</admin-state>
+        <allow-unsecure-connection></allow-unsecure-connection>
+        <gnmi>
+            <auto-config-save>true</auto-config-save>
+        </gnmi>
+    </grpc>
     <login-control>
         <motd>
             <text alu:operation="replace">{{ nokia_motd }}</text>