diff --git a/cord-pod/Makefile b/cord-pod/Makefile
index 39cc565..4567130 100644
--- a/cord-pod/Makefile
+++ b/cord-pod/Makefile
@@ -75,7 +75,7 @@
 cord: $(CONFIG_DIR)/images/vsg-1.1.img
 	$(RUN_TOSCA) $(COMMON_DIR)/tosca/mgmt-net.yaml
 	$(RUN_TOSCA) cord-services.yaml
-	$(RUN_TOSCA) public-net.yaml
+	$(RUN_TOSCA) $(COMMON_DIR)/tosca/public-net.yaml
 	$(RUN_TOSCA) $(COMMON_DIR)/tosca/cord-volt-devices.yaml
 
 cord-subscriber:
diff --git a/cord-pod/cleanup.sh b/cord-pod/cleanup.sh
index 6e6970c..9551cf2 100755
--- a/cord-pod/cleanup.sh
+++ b/cord-pod/cleanup.sh
@@ -49,4 +49,4 @@
 neutron net-delete management || true
 neutron net-delete management_hosts || true
 neutron net-delete mysite_vsg-access || true
-neutron net-delete exampleservice-public || true
+neutron net-delete public || true
diff --git a/cord-pod/public-net.yaml b/cord-pod/public-net.yaml
deleted file mode 100644
index c241fc0..0000000
--- a/cord-pod/public-net.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Set up public network for CORD POD
-imports:
-   - custom_types/xos.yaml
-
-topology_template:
-  node_templates:
-
-    service#vrouter:
-      type: tosca.nodes.VRouterService
-
-    public_template:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-          visibility: private
-          translation: none
-          vtn_kind: PUBLIC
-
-    public:
-      type: tosca.nodes.network.Network
-      properties:
-          ip_version: 4
-      requirements:
-          - network_template:
-              node: public_template
-              relationship: tosca.relationships.UsesNetworkTemplate
-          - owner:
-              node: mysite_public
-              relationship: tosca.relationships.MemberOfSlice
-          - vrouter_tenant:
-              node: service#vrouter
-              relationship: tosca.relationships.TenantOfService
-
-    mysite:
-      type: tosca.nodes.Site
-
-    mysite_public:
-      description: This slice exists solely to own the public network
-      type: tosca.nodes.Slice
-      properties:
-          network: noauto
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.MemberOfSite