diff --git a/upup/pkg/fi/cloudup/awstasks/natgateway.go b/upup/pkg/fi/cloudup/awstasks/natgateway.go
index 25e613a3e5..35e53e0e5e 100644
--- a/upup/pkg/fi/cloudup/awstasks/natgateway.go
+++ b/upup/pkg/fi/cloudup/awstasks/natgateway.go
@@ -110,10 +110,13 @@ func (e *NatGateway) Find(c *fi.Context) (*NatGateway, error) {
 		return nil, fmt.Errorf("found multiple elastic IPs attached to NatGateway %q", aws.StringValue(ngw.NatGatewayId))
 	}
 
-	// NATGateways don't have a Name (no tags), so we set the name to avoid spurious changes
-	actual.Name = e.Name
+	// NATGateways now have names and tags so lets pull from there instead.
+	actual.Name = findNameTag(ngw.Tags)
+	actual.Tags = intersectTags(ngw.Tags, e.Tags)
 	actual.Lifecycle = e.Lifecycle
 
+	actual.Shared = e.Shared
+
 	actual.AssociatedRouteTable = e.AssociatedRouteTable
 
 	e.ID = actual.ID