diff --git a/modules/rhizo_base/manifests/osmocom.pp b/modules/rhizo_base/manifests/osmocom.pp
index 496e6f0..c4e8523 100644
--- a/modules/rhizo_base/manifests/osmocom.pp
+++ b/modules/rhizo_base/manifests/osmocom.pp
@@ -33,6 +33,7 @@ class rhizo_base::osmocom {
                                    regsubst($vpn_ip_address,
                                             '^(\\d+)\\.(\\d+)\\.(\\d+)\\.(\\d+)$',
                                             '\\3-\\4')))
+  $mgw_num_ep     =  hiera('rhizo::mgw_num_ep', $bts.size * 24)
 
   package { "osmocom-nitb":
      ensure   => 'absent'
diff --git a/modules/rhizo_base/templates/osmo-mgw.cfg.erb b/modules/rhizo_base/templates/osmo-mgw.cfg.erb
index 511f82d..82d2277 100644
--- a/modules/rhizo_base/templates/osmo-mgw.cfg.erb
+++ b/modules/rhizo_base/templates/osmo-mgw.cfg.erb
@@ -54,7 +54,7 @@ mgcp
  sdp audio-payload send-ptime
  sdp audio-payload send-name
  loop 0
- number endpoints 31
+ number endpoints <%= @mgw_num_ep %>
  allow-transcoding
  osmux off
 <% if @bts[0]["model"] == "rbs2000" -%>