diff --git a/templates/821_network-ports-ngcp.yaml.tt2 b/templates/821_network-ports-ngcp.yaml.tt2
index 4f53f30..2c81aeb 100644
--- a/templates/821_network-ports-ngcp.yaml.tt2
+++ b/templates/821_network-ports-ngcp.yaml.tt2
@@ -65,24 +65,24 @@ port:
   # Nginx HTTPS (NGCP Panel)
   tcp:443:
     listening: true
-    ip: ["[% web_ext_ips.0 -%]"]
+    ip: ["[% web_ext_ips.0 %]"]
 
   # Nginx HTTPS (NGCP Panel Admin)
   tcp:1443:
     listening: true
-    ip: ["[% web_int_ips.0 -%]"]
+    ip: ["[% web_int_ips.0 %]"]
 
 [% END -%]
 [% IF is_mgmt && pbx.enable == 'yes' -%]
   # HTTPS PBX autoprovisioning
   tcp:1444:
     listening: true
-    ip: ["[% web_ext_ips.0 -%]"]
+    ip: ["[% web_ext_ips.0 %]"]
 
   # HTTP PBX autoprovisioning
   tcp:1445:
     listening: true
-    ip: ["[% web_ext_ips.0 -%]"]
+    ip: ["[% web_ext_ips.0 %]"]
 
 [% END -%]
   # MySQL
@@ -94,7 +94,7 @@ port:
   # Kamailio load-balancer
   tcp:5060:
     listening: [% node_state == 'active' ? 'true' : 'false' %]
-    ip: ["[% sip_ext_ips.0 -%]"]
+    ip: ["[% sip_ext_ips.0 %]"]
 
 [% END -%]
 [% IF is_proxy -%]
@@ -106,12 +106,12 @@ port:
   # Prosody
   tcp:5222:
     listening: [% node_state == 'active' ? 'true' : 'false' %]
-    ip: ["[% sip_ext_ips.0 -%]"]
+    ip: ["[% sip_ext_ips.0 %]"]
 
   # Prosody
   tcp:5269:
     listening: [% node_state == 'active' ? 'true' : 'false' %]
-    ip: ["[% sip_ext_ips.0 -%]"]
+    ip: ["[% sip_ext_ips.0 %]"]
 
   # Prosody
   tcp:5280:
diff --git a/templates/900_service-ngcp-api.yaml.tt2 b/templates/900_service-ngcp-api.yaml.tt2
index 0a22ecb..9ddf3ea 100644
--- a/templates/900_service-ngcp-api.yaml.tt2
+++ b/templates/900_service-ngcp-api.yaml.tt2
@@ -46,14 +46,14 @@
 
 command:
 
-  "curl --insecure -L http://[% web_ext_ips.0 -%]/":
+  "curl --insecure -L http://[% web_ext_ips.0 %]/":
     exit-status: 0
     stdout:
       - <title></title>
     stderr: []
     timeout: 30000
 
-  "curl --insecure -L https://[% web_ext_ips.0 -%]/":
+  "curl --insecure -L https://[% web_ext_ips.0 %]/":
     exit-status: 0
     stdout:
       - <title></title>
@@ -61,14 +61,14 @@ command:
     timeout: 30000
 
 
-  "curl --insecure -L http://[% web_int_ips.0 -%]/login/admin":
+  "curl --insecure -L http://[% web_int_ips.0 %]/login/admin":
     exit-status: 0
     stdout:
       - "/Admin Sign In/"
     stderr: []
     timeout: 30000
 
-  "curl --insecure -L https://[% web_int_ips.0 -%]/login/admin":
+  "curl --insecure -L https://[% web_int_ips.0 %]/login/admin":
     exit-status: 0
     stdout:
       - "/Admin Sign In/"
@@ -76,14 +76,14 @@ command:
     timeout: 30000
 
 
-  "curl --insecure -L http://[% web_int_ips.0 -%]:1443":
+  "curl --insecure -L http://[% web_int_ips.0 %]:1443":
     exit-status: 0
     stdout:
       - "/Admin Sign In/"
     stderr: []
     timeout: 30000
 
-  "curl --insecure -L https://[% web_int_ips.0 -%]:1443":
+  "curl --insecure -L https://[% web_int_ips.0 %]:1443":
     exit-status: 0
     stdout:
       - "/Admin Sign In/"
@@ -91,14 +91,14 @@ command:
     timeout: 30000
 
 
-  "curl --insecure -L http://[% web_ext_ips.0 -%]:1443/login/subscriber":
+  "curl --insecure -L http://[% web_ext_ips.0 %]:1443/login/subscriber":
     exit-status: 0
     stdout:
       - <title></title>
     stderr: []
     timeout: 30000
 
-  "curl --insecure -L https://[% web_ext_ips.0 -%]:1443/login/subscriber":
+  "curl --insecure -L https://[% web_ext_ips.0 %]:1443/login/subscriber":
     exit-status: 0
     stdout:
       - <title></title>
@@ -106,28 +106,28 @@ command:
     timeout: 30000
 
 
-  "curl --insecure -L http://[% web_int_ips.0 -%]:1443/api/":
+  "curl --insecure -L http://[% web_int_ips.0 %]:1443/api/":
     exit-status: 0
     stdout:
       - "/Authorization required/"
     stderr: []
     timeout: 30000
 
-  "curl --insecure -L https://[% web_int_ips.0 -%]:1443/api/":
+  "curl --insecure -L https://[% web_int_ips.0 %]:1443/api/":
     exit-status: 0
     stdout:
       - "/Authorization required/"
     stderr: []
     timeout: 30000
 
-  "curl --insecure -L http://administrator:administrator@[% web_int_ips.0 -%]:1443/api/":
+  "curl --insecure -L http://administrator:administrator@[% web_int_ips.0 %]:1443/api/":
     exit-status: 0
     stdout:
       - "/Authorization required/"
     stderr: []
     timeout: 30000
 
-  "curl --insecure -L https://administrator:administrator@[% web_int_ips.0 -%]:1443/api/":
+  "curl --insecure -L https://administrator:administrator@[% web_int_ips.0 %]:1443/api/":
     exit-status: 0
     stdout:
       - "/Sipwise NGCP HTTP API documentation/"
@@ -135,14 +135,14 @@ command:
     timeout: 30000
 
 
-  "curl --insecure -L http://[% web_ext_ips.0 -%]/api/":
+  "curl --insecure -L http://[% web_ext_ips.0 %]/api/":
     exit-status: 0
     stdout:
       - "/Authorization required/"
     stderr: []
     timeout: 30000
 
-  "curl --insecure -L https://[% web_ext_ips.0 -%]/api/":
+  "curl --insecure -L https://[% web_ext_ips.0 %]/api/":
     exit-status: 0
     stdout:
       - "/Authorization required/"
@@ -150,14 +150,14 @@ command:
     timeout: 30000
 
 
-  "curl --insecure -L http://administrator:administrator@[% web_int_ips.0 -%]/api/":
+  "curl --insecure -L http://administrator:administrator@[% web_int_ips.0 %]/api/":
     exit-status: 0
     stdout:
       - "/Authorization required/"
     stderr: []
     timeout: 30000
 
-  "curl --insecure -L https://administrator:administrator@[% web_int_ips.0 -%]/api/":
+  "curl --insecure -L https://administrator:administrator@[% web_int_ips.0 %]/api/":
     exit-status: 0
     stdout:
       - "/Authorization required/"
@@ -166,42 +166,42 @@ command:
 
 
 [% IF www_admin.enable == 'yes' && (is_mgmt || is_li_dist) && node_state == 'active' -%]
-  "curl -H 'NGCP-UserAgent: NGCP::API::Client' --insecure -L https://[% credentials.rest_api.auth_system.u %]:[% credentials.rest_api.auth_system.p %]@[% api_int_ips.0 -%]:[% www_admin.http_system.port %]/api/":
+  "curl -H 'NGCP-UserAgent: NGCP::API::Client' --insecure -L https://[% credentials.rest_api.auth_system.u %]:[% credentials.rest_api.auth_system.p %]@[% api_int_ips.0 %]:[% www_admin.http_system.port %]/api/":
     exit-status: 0
     stdout:
       - "/Sipwise NGCP HTTP API documentation/"
     stderr: []
     timeout: 30000
 
-  "curl -H 'NGCP-UserAgent: NGCP::API::Client' --insecure -L http://[% credentials.rest_api.auth_system.u %]:[% credentials.rest_api.auth_system.p %]@[% api_int_ips.0 -%]:[% www_admin.http_system.port %]/api/":
+  "curl -H 'NGCP-UserAgent: NGCP::API::Client' --insecure -L http://[% credentials.rest_api.auth_system.u %]:[% credentials.rest_api.auth_system.p %]@[% api_int_ips.0 %]:[% www_admin.http_system.port %]/api/":
     exit-status: 0
     stdout:
       - "/Authorization required/"
     stderr: []
     timeout: 30000
 
-  "curl -H 'NGCP-UserAgent: NGCP::API::Client' --insecure -L https://fakeuser:[% credentials.rest_api.auth_system.p %]@[% api_int_ips.0 -%]:[% www_admin.http_system.port %]/api/":
+  "curl -H 'NGCP-UserAgent: NGCP::API::Client' --insecure -L https://fakeuser:[% credentials.rest_api.auth_system.p %]@[% api_int_ips.0 %]:[% www_admin.http_system.port %]/api/":
     exit-status: 0
     stdout:
       - "/Authorization required/"
     stderr: []
     timeout: 30000
 
-  "curl -H 'NGCP-UserAgent: NGCP::API::Client' --insecure -L https://[% credentials.rest_api.auth_system.u %]:wrongpassword@[% api_int_ips.0 -%]:[% www_admin.http_system.port %]/api/":
+  "curl -H 'NGCP-UserAgent: NGCP::API::Client' --insecure -L https://[% credentials.rest_api.auth_system.u %]:wrongpassword@[% api_int_ips.0 %]:[% www_admin.http_system.port %]/api/":
     exit-status: 0
     stdout:
       - "/Authorization required/"
     stderr: []
     timeout: 30000
 
-  "curl -H 'NGCP-UserAgent: NGCP::API::Client' --insecure -L https://administrator:administrator@[% api_int_ips.0 -%]:[% www_admin.http_system.port %]/api/":
+  "curl -H 'NGCP-UserAgent: NGCP::API::Client' --insecure -L https://administrator:administrator@[% api_int_ips.0 %]:[% www_admin.http_system.port %]/api/":
     exit-status: 0
     stdout:
       - "/Authorization required/"
     stderr: []
     timeout: 30000
 
-  "curl --insecure -L https://[% credentials.rest_api.auth_system.u %]:[% credentials.rest_api.auth_system.p %]@[% api_int_ips.0 -%]:[% www_admin.http_system.port %]/api/":
+  "curl --insecure -L https://[% credentials.rest_api.auth_system.u %]:[% credentials.rest_api.auth_system.p %]@[% api_int_ips.0 %]:[% www_admin.http_system.port %]/api/":
     exit-status: 0
     stdout:
       - "/Authorization required/"