diff --git a/templates/bcd_request_template.j2 b/templates/bcd_request_template.j2
index f7e8de04be702aa5331164af93d1ef97664e4b28..d31d084198a6a124b0a4c9b3b498f6de2db99ebb 100644
--- a/templates/bcd_request_template.j2
+++ b/templates/bcd_request_template.j2
@@ -55,7 +55,7 @@
         <th style="border: 1px solid black; border-collapse: collapse;">Access From The Internet</th>
         <td style="border: 1px solid black; border-collapse: collapse;">{{ bcd_request.access_from_internet }}</td>
     </tr>
-    {% if bcd_request.access_from_internet and bcd_request.type_of_system != BCDSystemType.SERVER %}
+    {% if bcd_request.access_from_internet and bcd_request.type_of_system.value != 2 %}
     <tr>
         <th style="border: 1px solid black; border-collapse: collapse;">Access From The Internet Note</th>
         <td style="border: 1px solid black; border-collapse: collapse;">{{ bcd_request.access_from_internet_explanation }}</td>
@@ -65,7 +65,7 @@
         <th style="border: 1px solid black; border-collapse: collapse;">Type of Subnet</th>
         <td style="border: 1px solid black; border-collapse: collapse;">{{ bcd_request.type_of_subnet }}</td>
     </tr>
-    {% if bcd_request.type_of_subnet == IPAddressVersion.DUAL_STACK %}
+    {% if bcd_request.type_of_subnet.value == 2 %}
     <tr>
         <th style="border: 1px solid black; border-collapse: collapse;">IPv4 Subnet Size</th>
         <td style="border: 1px solid black; border-collapse: collapse;">{{ bcd_request.ipv4_subnet_size }}</td>