diff --git a/.gitignore b/.gitignore
index 3aaaad7..9e06fcf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,7 @@ coverage.txt
 .vscode/
 
 vendor
-private-src
\ No newline at end of file
+private-src
+
+dist
+local
\ No newline at end of file
diff --git a/firewall.go b/firewall.go
index e6e6bbf..19c1fad 100644
--- a/firewall.go
+++ b/firewall.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/coreos/go-iptables/iptables"
 	"github.com/pkg/errors"
@@ -77,6 +78,24 @@ func addBlockRules(firewall *Firewall, endpoints []ipAddressEndpoint, chain, net
 		}
 	}
 
+	// Agent uses HTTPs to resolve domain names
+	// Only apply UID filtering for OUTPUT chain
+	if chain == outputChain {
+		agentUID := fmt.Sprintf("%d", os.Getuid())
+		for _, dnsServer := range dnsServers {
+			err = ipt.Append(filterTable, chain, direction, netInterface,
+				"-m", "owner", "--uid-owner", agentUID,
+				protocol, tcp,
+				destination, dnsServer,
+				destinationPort, "443",
+				target, accept)
+
+			if err != nil {
+				return errors.Wrapf(err, "failed to add rule for DNS server %s", dnsServer)
+			}
+		}
+	}
+
 	for _, endpoint := range endpoints {
 		err = ipt.Append(filterTable, chain, direction, netInterface, protocol, tcp,
 			destination, endpoint.ipAddress,
@@ -87,16 +106,6 @@ func addBlockRules(firewall *Firewall, endpoints []ipAddressEndpoint, chain, net
 		}
 	}
 
-	// Agent uses HTTPs to resolve domain names
-	for _, dnsServer := range dnsServers {
-		err = ipt.Append(filterTable, chain, direction, netInterface, protocol, tcp,
-			destination, dnsServer, target, accept)
-
-		if err != nil {
-			return errors.Wrapf(err, "failed to add rule for DNS server %s", dnsServer)
-		}
-	}
-
 	// Allow AzureIPAddress
 	err = ipt.Append(filterTable, chain, direction, netInterface, protocol, tcp,
 		destination, AzureIPAddress, target, accept)