diff --git a/pkg/dagger.io/dagger/plan.cue b/pkg/dagger.io/dagger/plan.cue
index 524d4dc2..48c28c2c 100644
--- a/pkg/dagger.io/dagger/plan.cue
+++ b/pkg/dagger.io/dagger/plan.cue
@@ -24,7 +24,7 @@ package dagger
 		}
 
 		// Access client network endpoints
-		network: [address=#Address]: _#clientNetwork & {
+		network: [address=_#address]: _#clientNetwork & {
 			"address": address
 		}
 
@@ -97,7 +97,7 @@ _#clientNetwork: {
 
 	// URL to the socket
 	// Example: unix:///var/run/docker.sock
-	address: #Address
+	address: _#address
 
 	{
 		// unix socket or npipe
@@ -108,6 +108,9 @@ _#clientNetwork: {
 	}
 }
 
+// A network service address
+_#address: string & =~"^(unix://|npipe://).+"
+
 _#clientEnv: {
 	$dagger: task: _name: "ClientEnv"
 
diff --git a/pkg/dagger.io/dagger/types.cue b/pkg/dagger.io/dagger/types.cue
index b78f2f71..c7001409 100644
--- a/pkg/dagger.io/dagger/types.cue
+++ b/pkg/dagger.io/dagger/types.cue
@@ -32,7 +32,3 @@ package dagger
 #Socket: {
 	$dagger: service: _id: string
 }
-
-// A network service address
-#Address: string & =~"^(unix://|npipe://).+"
-// TODO: #Address: string & =~"^(tcp://|unix://|npipe://|udp://).+"