diff --git a/pkg/envoy/yaml/settings.go b/pkg/envoy/yaml/settings.go
index 6a91f4f00..c18c800ed 100644
--- a/pkg/envoy/yaml/settings.go
+++ b/pkg/envoy/yaml/settings.go
@@ -1,26 +1,15 @@
 package yaml
 
+import (
+	"github.com/cortezaproject/corteza-server/pkg/envoy/resource"
+)
+
 type (
 	settings map[string]interface{}
 )
 
-//func (wrap settings) MarshalEnvoy() ([]envoy.Node, error) {
-//	nn := make([]envoy.Node, 0, 1+len(wrap.modules))
-//	nn = append(nn, &envoy.SettingsNode{Ns: wrap.res})
-//
-//	if tmp, err := wrap.modules.MarshalEnvoy(); err != nil {
-//		return nil, err
-//	} else {
-//		nn = append(nn, tmp...)
-//	}
-//
-//	// @todo rbac
-//
-//	//if tmp, err := wrap.rules.MarshalEnvoy(); err != nil {
-//	//	return nil, err
-//	//} else {
-//	//	nn = append(nn, tmp...)
-//	//}
-//
-//	return nn, nil
-//}
+func (wrap settings) MarshalEnvoy() (nn []resource.Interface, err error) {
+	n := resource.NewSettings(wrap)
+
+	return []resource.Interface{n}, nil
+}