diff --git a/templates/800_network-hostname.yaml.tt2 b/templates/800_network-hostname.yaml.tt2
index 7b53ada..65bbec7 100644
--- a/templates/800_network-hostname.yaml.tt2
+++ b/templates/800_network-hostname.yaml.tt2
@@ -1,3 +1,16 @@
+[%-
+IF general.ngcp_type == 'spce';
+  host_match = "spce";
+  fqdn_match = "spce.";
+ELSIF general.ngcp_type == 'sppro';
+  host_match = "/sp[12]/";
+  fqdn_match = "/sp[12]/";
+ELSE;
+  host_match = "/[a-z]+[0-9]{2}[ab]/";
+  fqdn_match = "/sp[12]/";
+END;
+-%]
+
 command:
   hostname:
     exit-status: 0
@@ -6,19 +19,19 @@ command:
   hostname:
     exit-status: 0
     stdout:
-      - [% general.ngcp_type == 'spce' ? "spce" : "/sp[1,2]/" %]
+      - "[% host_match %]"
     stderr: []
 
   "hostname --fqdn":
     exit-status: 0
     stdout:
-      - [% general.ngcp_type == 'spce' ? "spce." : "/sp[1,2]/" %]
+      - "[% fqdn_match %]"
     stderr: []
 
   "hostname --short":
     exit-status: 0
     stdout:
-      - [% general.ngcp_type == 'spce' ? "spce" : "/sp[1,2]/" %]
+      - "[% host_match %]"
     stderr: []
 
 [% END -%]