diff --git a/src/coffee/compose.coffee b/src/coffee/compose.coffee
index 15d441e..866c8bf 100644
--- a/src/coffee/compose.coffee
+++ b/src/coffee/compose.coffee
@@ -23,7 +23,6 @@ module.exports = (config) ->
       for l in links
         deps[l] = condition: 'service_started' unless deps[l]
       service.depends_on = deps
-      # delete service.links
 
   _resolvePath: resolvePath = (root, path) ->
     path = path[1...] if path[0] is '/'
@@ -69,6 +68,7 @@ module.exports = (config) ->
     if service.labels['bigboat.service.type'] in ['service', 'oneoff']
       labels = _.extend {}, service.labels,
         'bigboat.service.type': 'net'
+      links = service.links?.map (l) -> "bb-net-#{l.split(':')[0]}:#{l.split(':')[0]}"
       subDomain = "#{instance}.#{config.domain}.#{config.tld}"
       netcontainer =
         image: config.net_container.image
@@ -81,6 +81,7 @@ module.exports = (config) ->
         stop_signal: 'SIGKILL'
         volumes: ['/var/run/dnsreg:/var/run/dnsreg']
         restart: 'unless-stopped'
+      netcontainer.links = links if links
       if config.net_container?.healthcheck
         netcontainer.healthcheck = config.net_container.healthcheck
 
@@ -92,6 +93,7 @@ module.exports = (config) ->
       # the network container
       delete service.hostname
       delete service.net
+      delete service.links
       service.network_mode = "service:bb-net-#{serviceName}"
 
       depends_on = composeLib.transformDependsOnToObject(service.depends_on) or {}