diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml
index a791344e0f..4cf5a72da0 100644
--- a/network/service_net_map.j2.yaml
+++ b/network/service_net_map.j2.yaml
@@ -133,9 +133,8 @@ parameters:
 {%- for network in networks if network.vip|default(false) %}
       {{network.name}}: {{network.name_lower}}_subnet
 {%- endfor %}
-      # FIXME(hjensas): This will return the same value no matter what ...
-      redis: {{ _service_nets.get('internal_api', 'internal_api') }}_subnet
-      ovn_dbs: {{ _service_nets.get('internal_api', 'internal_api') }}_subnet
+      redis: internal_api_subnet
+      ovn_dbs: internal_api_subnet
     type: json
 
   # We define mappings to work around names that break when doing the