diff --git a/xos/tosca/samples/cdn.yaml b/xos/tosca/samples/cdn.yaml
index e0247bc..e5a817c 100644
--- a/xos/tosca/samples/cdn.yaml
+++ b/xos/tosca/samples/cdn.yaml
@@ -128,7 +128,7 @@
                 node: dnsredir_server
                 relationship: tosca.relationships.SameHost
 
-  # now for some content
+   # Setup the CDN Service Provider
 
     main_service_provider:
         type: tosca.nodes.ServiceProvider
@@ -137,6 +137,8 @@
                  node: HyperCache
                  relationship: tosca.relationships.MemberOfService
 
+    # Wall Street Journal Content Provider
+
     wsj_content:
         type: tosca.nodes.ContentProvider
         requirements:
@@ -160,6 +162,9 @@
              - content_provider:
                    node: wsj_content
                    relationship: tosca.relationships.MemberOfContentProvider
+             - default_origin_server:
+                   node: http_si.wsj.net
+                   relationship: tosca.relationships.DefaultOriginServer
 
     s.wsj.net:
         type: tosca.nodes.CDNPrefix
@@ -167,6 +172,9 @@
              - content_provider:
                    node: wsj_content
                    relationship: tosca.relationships.MemberOfContentProvider
+             - default_origin_server:
+                   node: http_s.wsj.net
+                   relationship: tosca.relationships.DefaultOriginServer
 
     ore.wsj.net:
         type: tosca.nodes.CDNPrefix
@@ -174,6 +182,9 @@
              - content_provider:
                    node: wsj_content
                    relationship: tosca.relationships.MemberOfContentProvider
+             - default_origin_server:
+                   node: http_ore.wsj.net
+                   relationship: tosca.relationships.DefaultOriginServer
 
     http_www.wsj.com:
         type: tosca.nodes.OriginServer
@@ -182,6 +193,29 @@
                    node: wsj_content
                    relationship: tosca.relationships.MemberOfContentProvider
 
+    http_si.wsj.net:
+        type: tosca.nodes.OriginServer
+        requirements:
+             - content_provider:
+                   node: wsj_content
+                   relationship: tosca.relationships.MemberOfContentProvider
+
+    http_s.wsj.net:
+        type: tosca.nodes.OriginServer
+        requirements:
+             - content_provider:
+                   node: wsj_content
+                   relationship: tosca.relationships.MemberOfContentProvider
+
+    http_ore.wsj.net:
+        type: tosca.nodes.OriginServer
+        requirements:
+             - content_provider:
+                   node: wsj_content
+                   relationship: tosca.relationships.MemberOfContentProvider
+
+    # ON.Lab content provider
+
     on_lab_content:
         type: tosca.nodes.ContentProvider
         requirements:
@@ -189,3 +223,37 @@
                   node: main_service_provider
                   relationship: tosca.relationships.MemberOfServiceProvider
 
+    downloads.onosproject.org:
+        type: tosca.nodes.CDNPrefix
+        requirements:
+             - content_provider:
+                   node: on_lab_content
+                   relationship: tosca.relationships.MemberOfContentProvider
+             - default_origin_server:
+                   node: http_downloads.onosproject.org
+                   relationship: tosca.relationships.DefaultOriginServer
+
+    onlab.vicci.org:
+        type: tosca.nodes.CDNPrefix
+        requirements:
+             - content_provider:
+                   node: on_lab_content
+                   relationship: tosca.relationships.MemberOfContentProvider
+             - default_origin_server:
+                   node: http_onlab.vicci.org
+                   relationship: tosca.relationships.DefaultOriginServer
+
+    http_downloads.onosproject.org:
+        type: tosca.nodes.OriginServer
+        requirements:
+             - content_provider:
+                   node: on_lab_content
+                   relationship: tosca.relationships.MemberOfContentProvider
+
+    http_onlab.vicci.org:
+        type: tosca.nodes.OriginServer
+        requirements:
+             - content_provider:
+                   node: on_lab_content
+                   relationship: tosca.relationships.MemberOfContentProvider
+