diff --git a/modules/rhizo_base/templates/osmo-sgsn.cfg.erb b/modules/rhizo_base/templates/osmo-sgsn.cfg.erb
index b5c509e..5c473d6 100644
--- a/modules/rhizo_base/templates/osmo-sgsn.cfg.erb
+++ b/modules/rhizo_base/templates/osmo-sgsn.cfg.erb
@@ -14,16 +14,6 @@ log stderr
 line vty
  no login
 !
-sgsn
- gtp local-ip <%= @vpn_ip_address %>
- ggsn 0 remote-ip <%= @ggsn_ip_address %>
- ggsn 0 gtp-version 1
- ggsn 0 echo-interval 60
- auth-policy accept-all
- gsup remote-ip <%= @vpn_ip_address %>
- gsup remote-port 4222
- authentication optional
-!
 ns
  timer tns-block 3
  timer tns-block-retries 3
@@ -38,3 +28,14 @@ ns
 !
 bssgp
 !
+sgsn
+ gtp state-dir /var/lib/osmocom/
+ gtp local-ip <%= @vpn_ip_address %>
+ ggsn 0 remote-ip <%= @ggsn_ip_address %>
+ ggsn 0 gtp-version 1
+ ggsn 0 echo-interval 60
+ gsup ipa-name SGSN-<%= @ipa_name %>
+ gsup remote-ip <%= @vpn_ip_address %>
+ gsup remote-port 4222
+ authentication optional
+ auth-policy remote