diff --git a/modules/rhizomatica_base_system/manifests/init.pp b/modules/rhizomatica_base_system/manifests/init.pp
index 53416ca..e53c592 100644
--- a/modules/rhizomatica_base_system/manifests/init.pp
+++ b/modules/rhizomatica_base_system/manifests/init.pp
@@ -38,13 +38,13 @@ class rhizomatica_base_system {
   $arfcn_A         = hiera('rhizo::arfcn_A')
   $arfcn_B         = hiera('rhizo::arfcn_B')
 
-  $bts2_ip_address = hiera('rhizo::bts2_ip_address', undef)
-  $arfcn_C         = hiera('rhizo::arfcn_C', undef)
-  $arfcn_D         = hiera('rhizo::arfcn_D', undef)
+  $bts2_ip_address = hiera('rhizo::bts2_ip_address', false)
+  $arfcn_C         = hiera('rhizo::arfcn_C', false)
+  $arfcn_D         = hiera('rhizo::arfcn_D', false)
 
-  $bts3_ip_address = hiera('rhizo::bts3_ip_address', undef)
-  $arfcn_E         = hiera('rhizo::arfcn_E', undef)
-  $arfcn_F         = hiera('rhizo::arfcn_F', undef)
+  $bts3_ip_address = hiera('rhizo::bts3_ip_address', false)
+  $arfcn_E         = hiera('rhizo::arfcn_E', false)
+  $arfcn_F         = hiera('rhizo::arfcn_F', false)
 
   # VPN ip address
   $vpn_ip_address = hiera('rhizo::vpn_ip_address')
diff --git a/modules/rhizomatica_base_system/templates/osmo-nitb.cfg.erb b/modules/rhizomatica_base_system/templates/osmo-nitb.cfg.erb
index 68f409f..9147af6 100644
--- a/modules/rhizomatica_base_system/templates/osmo-nitb.cfg.erb
+++ b/modules/rhizomatica_base_system/templates/osmo-nitb.cfg.erb
@@ -183,7 +183,7 @@ network
     timeslot 7
      phys_chan_config TCH/F
      hopping enabled 0
-<% if not @bts2_ip_address.nil? -%>
+<% if ! @bts2_ip_address -%>
  bts 2
   type sysmobts
   band GSM850
@@ -289,7 +289,7 @@ network
      phys_chan_config TCH/F
      hopping enabled 0
 <% end -%>
-<% if not @bts3_ip_address.nil? %>
+<% if ! @bts3_ip_address -%>
  bts 4
   type sysmobts
   band GSM850