diff --git a/aether-roc-gui-v4/Chart.yaml b/aether-roc-gui-v4/Chart.yaml
index 960cb0d..382f41f 100644
--- a/aether-roc-gui-v4/Chart.yaml
+++ b/aether-roc-gui-v4/Chart.yaml
@@ -7,7 +7,7 @@
 description: Aether ROC Graphical User Interface
 kubeVersion: ">=1.15.0"
 type: application
-version: 4.0.8
+version: 4.0.9
 appVersion: 4.0.0
 keywords:
   - aether
diff --git a/aether-roc-gui-v4/values.yaml b/aether-roc-gui-v4/values.yaml
index ce5018d..d7684b7 100644
--- a/aether-roc-gui-v4/values.yaml
+++ b/aether-roc-gui-v4/values.yaml
@@ -10,7 +10,7 @@
 
 image:
   repository: onosproject/aether-roc-gui
-  tag: v0.8.6
+  tag: v0.8.7
   pullPolicy: IfNotPresent
   pullSecrets: []
 
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index de5baa1..3525dcc 100644
--- a/aether-roc-umbrella/Chart.yaml
+++ b/aether-roc-umbrella/Chart.yaml
@@ -7,7 +7,7 @@
 description: Aether ROC Umbrella chart to deploy all Aether ROC
 kubeVersion: ">=1.18.0"
 type: application
-version: 1.4.41
+version: 1.4.42
 appVersion: v0.0.0
 keywords:
   - aether
@@ -37,7 +37,7 @@
   - name: onos-config
     condition: import.onos-config.enabled
     repository: https://charts.onosproject.org
-    version: 1.3.10
+    version: 1.4.1
   - name: onos-gui
     condition: import.onos-gui.enabled
     repository: https://charts.onosproject.org
@@ -61,7 +61,7 @@
   - name: aether-roc-gui-v4
     condition: import.aether-roc-gui.v4.enabled
     repository: "file://../aether-roc-gui-v4"
-    version: 4.0.8
+    version: 4.0.9
   - name: sdcore-adapter
     condition: import.sdcore-adapter.v3.enabled
     repository: "file://../sdcore-adapter"
@@ -69,7 +69,7 @@
   - name: sdcore-adapter-v4
     condition: import.sdcore-adapter.v4.enabled
     repository: "file://../sdcore-adapter-v4"
-    version: 4.0.11
+    version: 4.0.12
   - name: subscriber-proxy
     condition: import.subscriber-proxy.enabled
     repository: "file://../subscriber-proxy"
@@ -108,3 +108,7 @@
     repository: "file://../prom-label-proxy"
     version: 0.0.1
     alias: prom-label-proxy-acc
+  - name: demo-exporter
+    condition: import.demo-exporter.enabled
+    repository: "file://../demo-exporter"
+    version: 0.0.1
diff --git a/aether-roc-umbrella/files/opa-rbac/aether-4.0.0.rego b/aether-roc-umbrella/files/opa-rbac/aether-4.0.0.rego
index b47bc60..ddf2110 100644
--- a/aether-roc-umbrella/files/opa-rbac/aether-4.0.0.rego
+++ b/aether-roc-umbrella/files/opa-rbac/aether-4.0.0.rego
@@ -14,7 +14,6 @@
     device_group := devicegroups
     enterprise := enterprises
     ip_domain := ip_domains
-    network := networks
     site := sites
     template := templates
     traffic_class := trafficclasses
@@ -46,11 +45,6 @@
                 ip_domain
             ]
         },
-        "network": {
-            "network": [
-                network
-            ]
-        },
         "site": {
             "site": [
                 site
@@ -61,8 +55,8 @@
                 template
             ]
         },
-        "traffic_class": {
-            "traffic_class": {
+        "traffic-class": {
+            "traffic-class": {
                 traffic_class
             }
         },
@@ -104,11 +98,6 @@
     ["AetherROCAdmin", ip_domain.enterprise][_] == input.groups[i]
 }
 
-networks[network] {
-    network := input.network.network[_]
-    ["AetherROCAdmin", network.enterprise][_] == input.groups[i]
-}
-
 sites[site] {
     site := input.site.site[_]
     ["AetherROCAdmin", site.enterprise][_] == input.groups[i]
diff --git a/aether-roc-umbrella/files/opa-rbac/test/aether-4.0.0-example-get.json b/aether-roc-umbrella/files/opa-rbac/test/aether-4.0.0-example-get.json
index 7755521..cc5e3e8 100644
--- a/aether-roc-umbrella/files/opa-rbac/test/aether-4.0.0-example-get.json
+++ b/aether-roc-umbrella/files/opa-rbac/test/aether-4.0.0-example-get.json
@@ -12,10 +12,16 @@
         "address": "nvr.starbucks.com",
         "endpoint": [
           {
-            "name": "rtsp",
+            "endpoint_id": "rtsp",
+            "display_name": "rtsp port",
             "port_end": 3330,
             "port_start": 3316,
-            "protocol": "UDP"
+            "protocol": "UDP",
+            "mbr": {
+              "uplink": 1000000,
+              "downlink": 1000000
+            },
+            "traffic_class": "class_1"
           }
         ],
         "id": "starbucks_nvr"
@@ -27,10 +33,16 @@
         "address": "fidelio.starbucks.com",
         "endpoint": [
           {
-            "name": "fidelio",
+            "endpoint_id": "fidelio",
+            "display_name": "fidelio application",
             "port_end": 7588,
             "port_start": 7585,
-            "protocol": "TCP"
+            "protocol": "TCP",
+            "mbr": {
+              "uplink": 2000000,
+              "downlink": 2000000
+            },
+            "traffic_class": "class_1"
           }
         ],
         "id": "starbucks_fidelio"
@@ -42,10 +54,16 @@
         "address": "da.acme.com",
         "endpoint": [
           {
-            "name": "da",
+            "endpoint_id": "da",
+            "display_name": "data acquisition endpoint",
             "port_end": 7588,
             "port_start": 7585,
-            "protocol": "TCP"
+            "protocol": "TCP",
+            "mbr": {
+              "uplink": 2000000,
+              "downlink": 1000000
+            },
+            "traffic_class": "class_2"
           }
         ],
         "id": "acme_dataacquisition"
@@ -58,6 +76,7 @@
         "core_5g_endpoint": "http://aether_roc_umbrella_sdcore_test_dummy/v1/config/5g",
         "description": "5G Test",
         "display_name": "ROC 5G Test Connectivity Service",
+        "acc_prometheus_url": "./prometheus_acc",
         "id": "cs5gtest"
       },
       {
@@ -76,13 +95,27 @@
         "display_name": "Global Default Device Group",
         "id": "defaultent_defaultsite_default",
         "ip_domain": "defaultent_defaultip",
-        "site": "defaultent_defaultsite"
+        "site": "defaultent_defaultsite",
+        "device": {
+          "mbr": {
+            "uplink": 1000000,
+            "downlink": 1000000
+          },
+          "traffic_class": "class_1"
+        }
       },
       {
         "display_name": "Seattle Default",
         "id": "starbucks_seattle_default",
         "ip_domain": "starbucks_seattle",
-        "site": "starbucks_seattle"
+        "site": "starbucks_seattle",
+        "device": {
+          "mbr": {
+            "uplink": 1000000,
+            "downlink": 1000000
+          },
+          "traffic_class": "class_1"
+        }
       },
       {
         "display_name": "Seattle Cameras",
@@ -91,15 +124,24 @@
           {
             "imsi_range_from": 0,
             "imsi_range_to": 3,
-            "name": "counters"
+            "imsi_id": "counters",
+            "display_name": "counter devices"
           },
           {
             "imsi_range_from": 10,
             "imsi_range_to": 14,
-            "name": "store"
+            "imsi_id": "store",
+            "display_name": "store devices"
           }
         ],
         "ip_domain": "starbucks_seattle",
+        "device": {
+          "mbr": {
+            "uplink": 1000000,
+            "downlink": 1000000
+          },
+          "traffic_class": "class_1"
+        },
         "site": "starbucks_seattle"
       },
       {
@@ -109,22 +151,38 @@
           {
             "imsi_range_from": 20,
             "imsi_range_to": 22,
-            "name": "tills"
+            "imsi_id": "tills",
+            "display_name": "tills"
           },
           {
             "imsi_range_from": 30,
             "imsi_range_to": 34,
-            "name": "store"
+            "imsi_id": "store",
+            "display_name": "store devices"
           }
         ],
         "ip_domain": "starbucks_seattle",
+        "device": {
+          "mbr": {
+            "uplink": 10000000,
+            "downlink": 20000000
+          },
+          "traffic_class": "class_1"
+        },
         "site": "starbucks_seattle"
       },
       {
         "display_name": "New York Default",
         "id": "starbucks_newyork_default",
         "ip_domain": "starbucks_newyork",
-        "site": "starbucks_newyork"
+        "site": "starbucks_newyork",
+        "device": {
+          "mbr": {
+            "uplink": 1000000,
+            "downlink": 1000000
+          },
+          "traffic_class": "class_1"
+        }
       },
       {
         "display_name": "New York Cameras",
@@ -133,16 +191,24 @@
           {
             "imsi_range_from": 40,
             "imsi_range_to": 41,
-            "name": "front"
+            "imsi_id": "front",
+            "display_name": "front cameras"
           },
           {
             "imsi_range_from": 50,
             "imsi_range_to": 55,
-            "name": "store"
+            "imsi_id": "store",
+            "display_name": "store cameras"
           }
         ],
         "ip_domain": "starbucks_newyork",
-        "site": "starbucks_newyork"
+        "site": "starbucks_newyork",
+        "device": {
+          "mbr": {
+            "uplink": 1000000
+          },
+          "traffic_class": "class_1"
+        }
       },
       {
         "display_name": "New York POS",
@@ -151,16 +217,24 @@
           {
             "imsi_range_from": 60,
             "imsi_range_to": 61,
-            "name": "tills"
+            "imsi_id": "tills",
+            "display_name": "tills"
           },
           {
             "imsi_range_from": 70,
             "imsi_range_to": 73,
-            "name": "store"
+            "imsi_id": "store",
+            "display_name": "store"
           }
         ],
         "ip_domain": "starbucks_newyork",
-        "site": "starbucks_newyork"
+        "site": "starbucks_newyork",
+        "device": {
+          "mbr": {
+            "downlink": 1000000
+          },
+          "traffic_class": "class_1"
+        }
       },
       {
         "display_name": "ACME Default",
@@ -175,16 +249,25 @@
           {
             "imsi_range_from": 0,
             "imsi_range_to": 3,
-            "name": "production"
+            "imsi_id": "production",
+            "display_name": "production robots"
           },
           {
             "imsi_range_from": 10,
             "imsi_range_to": 12,
-            "name": "warehouse"
+            "imsi_id": "warehouse",
+            "display_name": "warehouse robots"
           }
         ],
         "ip_domain": "acme_chicago",
-        "site": "acme_chicago"
+        "site": "acme_chicago",
+        "device": {
+          "mbr": {
+            "uplink": 5000000,
+            "downlink": 1000000
+          },
+          "traffic_class": "class_1"
+        }
       }
     ]
   },
@@ -298,12 +381,29 @@
         },
         "small_cell": [
           {
-            "name": "cell1",
+            "small_cell_id": "cell1",
+            "display_name": "cell number one",
             "address": "ap2.chicago.acme.com",
             "enable": true,
             "tac": "8002"
           }
-        ]
+        ],
+        "monitoring": {
+          "edge_cluster_prometheus_url": "prometheus_ace1",
+          "edge_monitoring_prometheus_url": "prometheus_amp",
+          "edge_device": [
+            {
+              "edge_device_id": "acme_chicago_monitoring_pi_1",
+              "display_name": "sprocket monitoring pi",
+              "description": "monitoring device placed near the sprocket manufacturing machine"
+            },
+            {
+              "edge_device_id": "acme_chicago_monitoring_pi_2",
+              "display_name": "widget monitoring pi",
+              "description": "monitoring device placed near the widget refinisher"
+            }
+          ]
+        }
       },
       {
         "description": "Starbucks Corp HQ",
@@ -318,18 +418,31 @@
         },
         "small_cell": [
           {
-            "name": "cell2",
+            "small_cell_id": "cell2",
+            "display_name": "cell number 2",
             "address": "ap1.seattle.starbucks.com",
             "enable": true,
             "tac": "0654"
           },
           {
-            "name": "cell3",
+            "small_cell_id": "cell3",
+            "display_name": "cell number 3",
             "address": "ap2.seattle.starbucks.com",
             "enable": true,
             "tac": "87475"
           }
-        ]
+        ],
+        "monitoring": {
+          "edge_cluster_prometheus_url": "prometheus_ace1",
+          "edge_monitoring_prometheus_url": "prometheus_amp",
+          "edge_device": [
+            {
+              "edge_device_id": "starbucks_seattle_monitoring_pi_1",
+              "display_name": "lobby monitoring device",
+              "description": "monitoring device placed in the lobby"
+            }
+          ]
+        }
       },
       {
         "description": "Starbucks New York",
@@ -344,42 +457,57 @@
         },
         "small_cell": [
           {
-            "name": "cell4",
+            "small_cell_id": "cell4",
+            "display_name": "cell number four",
             "address": "ap2.newyork.starbucks.com",
             "enable": true,
             "tac": "8002"
           }
-        ]
+        ],
+        "monitoring": {
+          "edge_cluster_prometheus_url": "prometheus_ace1",
+          "edge_monitoring_prometheus_url": "prometheus_amp",
+          "edge_device": [
+            {
+              "edge_device_id": "starbucks_newyork_monitoring_pi_1",
+              "display_name": "cash registers",
+              "description": "monitoring device placed near the cash registers"
+            }
+          ]
+        }
       }
     ]
   },
   "template": {
     "template": [
       {
+        "default_behavior": "DENY_ALL",
         "description": "VCS Template 1",
         "display_name": "Template 1",
         "id": "template_1",
         "sd": 10886763,
         "sst": 158,
-        "traffic_class": "class_1",
-        "device": {
+        "slice": {
           "mbr": {
-            "uplink": 10,
-            "downlink": 5
+            "uplink": 10000000,
+            "downlink": 5000000,
+            "uplink_burst_size": 600000,
+            "downlink_burst_size": 600000
           }
         }
       },
       {
+        "default_behavior": "DENY_ALL",
         "description": "VCS Template 2",
         "display_name": "Template 2",
         "id": "template_2",
         "sd": 16619900,
         "sst": 157,
-        "traffic_class": "class_2",
-        "device": {
+        "slice": {
           "mbr": {
-            "uplink": 10,
-            "downlink": 5
+            "uplink": 10000000,
+            "downlink": 5000000,
+            "uplink_burst_size": 500000
           }
         }
       }
@@ -392,56 +520,95 @@
         "display_name": "Class 1",
         "id": "class_1",
         "qci": 10,
-        "arp": 1
+        "arp": 1,
+        "pelr": 10,
+        "pdb": 100
       },
       {
         "description": "Medium Priority TC",
         "display_name": "Class 2",
         "id": "class_2",
         "qci": 20,
-        "arp": 1
+        "arp": 1,
+        "pelr": 10,
+        "pdb": 100
       },
       {
         "description": "Low Priority TC",
         "display_name": "Class 3",
         "id": "class_3",
         "qci": 30,
-        "arp": 1
+        "arp": 1,
+        "pelr": 10,
+        "pdb": 100
       }
     ]
   },
   "upf": {
     "upf": [
       {
-        "address": "seattle.cameras_upf.starbucks.com",
-        "description": "Seattle Cameras UPF",
-        "display_name": "Seattle Cameras",
-        "id": "starbucks_seattle_cameras",
+        "address": "entry1.upfpool.seattle.starbucks.com",
+        "description": "Seattle UPF Pool _ Entry 1",
+        "display_name": "Seattle Pool 1",
+        "id": "starbucks_seattle_pool_entry1",
         "enterprise": "starbucks",
-        "port": 9229
+        "site": "starbucks_seattle",
+        "port": 9229,
+        "config_endpoint": "http://entry1_seattle"
       },
       {
-        "address": "newyork.cameras_upf.starbucks.com",
-        "description": "New York Cameras UPF",
-        "display_name": "New York Cameras",
-        "id": "starbucks_newyork_cameras",
+        "address": "entry2.upfpool.seattle.starbucks.com",
+        "description": "Seattle UPF Pool _ Entry 2",
+        "display_name": "Seattle Pool 2",
+        "id": "starbucks_seattle_pool_entry2",
         "enterprise": "starbucks",
+        "site": "starbucks_seattle",
+        "port": 9229,
+        "config_endpoint": "http://entry2_seattle"
+      },
+      {
+        "address": "entry1.upfpool.newyork.starbucks.com",
+        "description": "New York UPF Pool _ Entry 1",
+        "display_name": "New York Pool 1",
+        "id": "starbucks_newyork_pool_entry1",
+        "enterprise": "starbucks",
+        "site": "starbucks_newyork",
         "port": 6161
       },
       {
-        "address": "chicago.robots_upf.acme.com",
-        "description": "Chicago Robots UPF",
-        "display_name": "Chicago Robots",
-        "id": "acme_chicago_robots",
+        "address": "entry2.upfpool.newyork.starbucks.com",
+        "description": "New York UPF Pool _ Entry 2",
+        "display_name": "New York Pool 2",
+        "id": "starbucks_newyork_pool_entry2",
+        "enterprise": "starbucks",
+        "site": "starbucks_newyork",
+        "port": 6161
+      },
+      {
+        "address": "entry3.upfpool.newyork.starbucks.com",
+        "description": "New York UPF Pool _ Entry 3",
+        "display_name": "New York Pool 3",
+        "id": "starbucks_newyork_pool_entry3",
+        "enterprise": "starbucks",
+        "site": "starbucks_newyork",
+        "port": 6161
+      },
+      {
+        "address": "entry1.upfpool.chicago.acme.com",
+        "description": "Chicago UPF Pool _ Entry 1",
+        "display_name": "Chicago Pool 1",
+        "id": "acme_chicago_pool_entry1",
         "enterprise": "acme",
+        "site": "acme_chicago",
         "port": 6161
       },
       {
-        "address": "newyork.pos_upf.starbucks.com",
-        "description": "NewYork POS UPF",
-        "display_name": "NewYork POS",
-        "id": "starbucks_newyork_pos",
-        "enterprise": "starbucks",
+        "address": "entry2.upfpool.chicago.acme.com",
+        "description": "Chicago UPF Pool _ Entry 2",
+        "display_name": "Chicago Pool 2",
+        "id": "acme_chicago_pool_entry2",
+        "enterprise": "acme",
+        "site": "acme_chicago",
         "port": 6161
       }
     ]
@@ -455,6 +622,7 @@
             "application": "starbucks_nvr"
           }
         ],
+        "default_behavior": "DENY_ALL",
         "description": "New York Cameras",
         "device_group": [
           { "enable": true,
@@ -466,13 +634,14 @@
         "id": "starbucks_newyork_cameras",
         "sd": 8284729,
         "sst": 127,
-        "template": "template_1",
-        "traffic_class": "class_1",
-        "upf": "starbucks_newyork_cameras",
-        "device": {
+        "upf": "starbucks_newyork_pool_entry1",
+        "site": "starbucks_newyork",
+        "slice": {
           "mbr": {
-            "downlink": 10,
-            "uplink": 10
+            "uplink": 10000000,
+            "downlink": 5000000,
+            "uplink_burst_size": 600000,
+            "downlink_burst_size": 600000
           }
         }
       },
@@ -483,6 +652,7 @@
             "application": "starbucks_nvr"
           }
         ],
+        "default_behavior": "DENY_ALL",
         "description": "Seattle Cameras",
         "device_group": [
           { "enable": true,
@@ -494,13 +664,12 @@
         "id": "starbucks_seattle_cameras",
         "sd": 2973238,
         "sst": 79,
-        "template": "template_2",
-        "traffic_class": "class_2",
-        "upf": "starbucks_seattle_cameras",
-        "device": {
+        "upf": "starbucks_seattle_pool_entry1",
+        "site": "starbucks_seattle",
+        "slice": {
           "mbr": {
-            "downlink": 10,
-            "uplink": 5
+            "uplink": 10000000,
+            "uplink_burst_size": 600000
           }
         }
       },
@@ -511,6 +680,7 @@
             "application": "acme_dataacquisition"
           }
         ],
+        "default_behavior": "DENY_ALL",
         "description": "Chicago Robots",
         "device_group": [
           { "enable": true,
@@ -522,17 +692,15 @@
         "id": "acme_chicago_robots",
         "sd": 2973238,
         "sst": 79,
-        "template": "template_2",
-        "traffic_class": "class_2",
-        "upf": "acme_chicago_robots",
-        "device": {
+        "upf": "acme_chicago_pool_entry1",
+        "site": "acme_chicago",
+        "slice": {
           "mbr": {
-            "downlink": 10,
-            "uplink": 5
+            "downlink": 5000000,
+            "downlink_burst_size": 600000
           }
         }
       }
     ]
   }
-
 }
diff --git a/aether-roc-umbrella/values.yaml b/aether-roc-umbrella/values.yaml
index d0c1188..ac948a0 100644
--- a/aether-roc-umbrella/values.yaml
+++ b/aether-roc-umbrella/values.yaml
@@ -71,6 +71,8 @@
       enabled: true
     amp:
       enabled: true
+  demo-exporter:
+    enabled: true
 
 # ONOS-TOPO
 onos-topo:
@@ -273,11 +275,11 @@
                summary: 'VCS {{ $labels.vcs_id }} jitter high'
     prometheus.yml:
       scrape_configs:
-        - job_name: sdcore-exporter
+        - job_name: demo-exporter
           scrape_interval: 2s
           static_configs:
             - targets:
-                - sdcore-adapter-v4-exporter:2112
+                - demo-exporter:2112
 
 prometheus-amp:
   pushgateway:
@@ -291,11 +293,11 @@
   serverFiles:
     prometheus.yml:
       scrape_configs:
-        - job_name: sdcore-exporter
+        - job_name: demo-exporter
           scrape_interval: 2s
           static_configs:
             - targets:
-                - sdcore-adapter-v4-exporter:2112
+                - demo-exporter:2112
   
 prometheus-ace:
   pushgateway:
@@ -309,11 +311,11 @@
   serverFiles:
     prometheus.yml:
       scrape_configs:
-        - job_name: sdcore-exporter
+        - job_name: demo-exporter
           scrape_interval: 2s
           static_configs:
             - targets:
-                - sdcore-adapter-v4-exporter:2112
+                - demo-exporter:2112
         - job_name: kube-state-metrics
           scrape_interval: 2s
           static_configs:
diff --git a/demo-exporter/.helmignore b/demo-exporter/.helmignore
new file mode 100644
index 0000000..01d4cd9
--- /dev/null
+++ b/demo-exporter/.helmignore
@@ -0,0 +1,25 @@
+# SPDX-FileCopyrightText: 2021 Open Networking Foundation
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/demo-exporter/Chart.yaml b/demo-exporter/Chart.yaml
new file mode 100644
index 0000000..a88ef1a
--- /dev/null
+++ b/demo-exporter/Chart.yaml
@@ -0,0 +1,18 @@
+# SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+apiVersion: v2
+name: demo-exporter
+description: Aether ROC Demo Exporter
+kubeVersion: ">=1.15.0"
+type: application
+version: 0.0.1
+appVersion: v0.0.0
+keywords:
+  - aether
+  - exporter
+home: https://www.opennetworking.org/aether/
+maintainers:
+  - name: Aether Ops team
+    email: support@opennetworking.org
diff --git a/demo-exporter/README.md b/demo-exporter/README.md
new file mode 100644
index 0000000..54d8c58
--- /dev/null
+++ b/demo-exporter/README.md
@@ -0,0 +1,9 @@
+<!--
+SPDX-FileCopyrightText: 2021 Open Networking Foundation
+
+SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+-->
+
+## Aether Demo Exporter
+
+Provides a [Helm] chart for deploying Aether Demo Exporter on [Kubernetes].
diff --git a/demo-exporter/files/certs/README.md b/demo-exporter/files/certs/README.md
new file mode 100644
index 0000000..ae3f841
--- /dev/null
+++ b/demo-exporter/files/certs/README.md
@@ -0,0 +1,32 @@
+<!--
+SPDX-FileCopyrightText: 2021 Open Networking Foundation
+
+SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+-->
+
+This folder contains self-signed certificates for use in testing. _DO NOT USE THESE
+CERTIFICATES IN PRODUCTION!_
+
+The certificates were generated with the
+https://github.com/onosproject/simulators/blob/master/pkg/certs/generate_certs.sh 
+script as
+```bash
+generate_certs.sh sdcore-adapter
+```
+
+In this folder they **must** be (re)named
+* tls.cacrt
+* tls.crt
+* tls.key
+
+Use
+```bash
+openssl x509 -in deployments/helm/onos-config/files/certs/tls.crt -text -noout
+```
+to verify the contents (especially the subject).
+
+There is another Cert for onos-config in test/certs but these were created with:
+```
+generate-certs.sh onos-config
+```
+and are left named onf.cacrt, onos-config.key and onos-config.crt
\ No newline at end of file
diff --git a/demo-exporter/files/certs/tls.cacert b/demo-exporter/files/certs/tls.cacert
new file mode 100644
index 0000000..879bc06
--- /dev/null
+++ b/demo-exporter/files/certs/tls.cacert
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDYDCCAkgCCQDe99fSN9qxSTANBgkqhkiG9w0BAQsFADByMQswCQYDVQQGEwJV
+UzELMAkGA1UECAwCQ0ExEjAQBgNVBAcMCU1lbmxvUGFyazEMMAoGA1UECgwDT05G
+MRQwEgYDVQQLDAtFbmdpbmVlcmluZzEeMBwGA1UEAwwVY2Eub3Blbm5ldHdvcmtp
+bmcub3JnMB4XDTE5MDQxMTA5MDYxM1oXDTI5MDQwODA5MDYxM1owcjELMAkGA1UE
+BhMCVVMxCzAJBgNVBAgMAkNBMRIwEAYDVQQHDAlNZW5sb1BhcmsxDDAKBgNVBAoM
+A09ORjEUMBIGA1UECwwLRW5naW5lZXJpbmcxHjAcBgNVBAMMFWNhLm9wZW5uZXR3
+b3JraW5nLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMEg7CZR
+X8Y+syKHaQCh6mNIL1D065trwX8RnuKM2kBwSu034zefQAPloWugSoJgJnf5fe0j
+nUD8gN3Sm8XRhCkvf67pzfabgw4n8eJmHScyL/ugyExB6Kahwzn37bt3oT3gSqhr
+6PUznWJ8fvfVuCHZZkv/HPRp4eyAcGzbJ4TuB0go4s6VE0WU5OCxCSlAiK3lvpVr
+3DOLdYLVoCa5q8Ctl3wXDrfTLw5/Bpfrg9fF9ED2/YKIdV8KZ2ki/gwEOQqWcKp8
+0LkTlfOWsdGjp4opPuPT7njMBGXMJzJ8/J1e1aJvIsoB7n8XrfvkNiWL5U3fM4N7
+UZN9jfcl7ULmm7cCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAIh6FjkQuTfXddmZY
+FYpoTen/VD5iu2Xxc1TexwmKeH+YtaKp1Zk8PTgbCtMEwEiyslfeHTMtODfnpUIk
+DwvtB4W0PAnreRsqh9MBzdU6YZmzGyZ92vSUB3yukkHaYzyjeKM0AwgVl9yRNEZw
+Y/OM070hJXXzJh3eJpLl9dlUbMKzaoAh2bZx6y3ZJIZFs/zrpGfg4lvBAvfO/59i
+mxJ9bQBSN3U2Hwp6ioOQzP0LpllfXtx9N5LanWpB0cu/HN9vAgtp3kRTBZD0M1XI
+Ctit8bXV7Mz+1iGqoyUhfCYcCSjuWTgAxzir+hrdn7uO67Hv4ndCoSj4SQaGka3W
+eEfVeA==
+-----END CERTIFICATE-----
diff --git a/demo-exporter/files/certs/tls.crt b/demo-exporter/files/certs/tls.crt
new file mode 100644
index 0000000..49fe029
--- /dev/null
+++ b/demo-exporter/files/certs/tls.crt
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDYzCCAksCFErBGzsXHo1l8bmZRmDkF+h2bsdWMA0GCSqGSIb3DQEBCwUAMHIx
+CzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTESMBAGA1UEBwwJTWVubG9QYXJrMQww
+CgYDVQQKDANPTkYxFDASBgNVBAsMC0VuZ2luZWVyaW5nMR4wHAYDVQQDDBVjYS5v
+cGVubmV0d29ya2luZy5vcmcwHhcNMjExMTA1MTQyNzU0WhcNMzExMTAzMTQyNzU0
+WjBqMQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExEjAQBgNVBAcMCU1lbmxvUGFy
+azEMMAoGA1UECgwDT05GMRQwEgYDVQQLDAtFbmdpbmVlcmluZzEWMBQGA1UEAwwN
+ZGVtby1leHBvcnRlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPUf
+jSlFz8wQBeUid4hUq8gL9Tggoe38QX26j/XuLsbM0dxzJMD2k2nDXOz0caMlUYqX
+sOSn5GRtoZsVa9lKbNTxF9HkEPLV7CWv+gqRXYOOPI9Wjr5lDKufxeKKXrW+zJvu
+gUWRQ+l9bZLb7KHbhQ+mmLQC1/r+PgS1CIMc1PQ560FPpI9w+cl3IeY8XvEvKDGE
+cxroDfPqrv0gTtOekuGBVQj1ivUg+SdfyP8j5RX/RyCUfuWJoNJEDWKioKKBjrhK
+rP17yILr0RZst8tAuwxJXruMzNDribYgJn3bXHUQjX1tiFr48ProjfQCr77Elvd9
+DSd4XxtPwomJPXcQKN0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAXFs7WVelZ+6X
+ASTmhLZtzoWtBOjPCGEnBrK2SHVRHbaVLBBaZp/sW2+XkPMQrHwWVpFP+7ttrJ0V
+fsfGlRrZ6uxB9MDK9D2RS6Zo8HKUXCQWs4VRcw7Zzy1NPa4MLBAXRxLv83t4UfAj
+cUFkZ0UhKlFJNUZ74AcMBzK121BzxmDCDwnZWyeqzB8SKexdk8I+sEoc5/KIM/QP
+LdTKe3vw/WGH7p45M693BXWc5lyAcwB8iSmecjlPB5peN71sY3OeSJGUvS+Qbdla
+FBPC5tNbp4byRVciyLKnwxg4HmOfNhCZbRVYG2WHBaT7oMtx+4DaNs8ePwWIwvko
+ga0pInZUNg==
+-----END CERTIFICATE-----
diff --git a/demo-exporter/files/certs/tls.key b/demo-exporter/files/certs/tls.key
new file mode 100644
index 0000000..3e150fb
--- /dev/null
+++ b/demo-exporter/files/certs/tls.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQD1H40pRc/MEAXl
+IneIVKvIC/U4IKHt/EF9uo/17i7GzNHccyTA9pNpw1zs9HGjJVGKl7Dkp+RkbaGb
+FWvZSmzU8RfR5BDy1ewlr/oKkV2DjjyPVo6+ZQyrn8Xiil61vsyb7oFFkUPpfW2S
+2+yh24UPppi0Atf6/j4EtQiDHNT0OetBT6SPcPnJdyHmPF7xLygxhHMa6A3z6q79
+IE7TnpLhgVUI9Yr1IPknX8j/I+UV/0cglH7liaDSRA1ioqCigY64Sqz9e8iC69EW
+bLfLQLsMSV67jMzQ64m2ICZ921x1EI19bYha+PD66I30Aq++xJb3fQ0neF8bT8KJ
+iT13ECjdAgMBAAECggEAHFfroKwb3QK1S8tyeucffeA0GKtdTgFvKTSbVNqXuhEQ
+6ya9Rzq7zOz0H8ocIbs89IOZxrbLJ/mtSBtv/w4mC3FdSb3PX+Twi2MPzI0GfSHD
+Sue9VbKlhmrRHOLXFLjdO+KWPA8SBTuloeegMw8JEcg3vAjgJHulfDHarB53WU3n
+QXm34u759a4xGFFGtHW7wzDjsnt6Cm78Moi3IIbs40cE7EbUkGoHYstaQH8Kl2CI
+TIFcT2KuzJ057dxcS6KsBNbbyG0vbcBjV+221EGIcjuj7p53XhhLIE1p4tdv+9TG
+SZDPpgKLjMkIqeeq7It2XAG3sCkirwzEF7n+rVCeAQKBgQD6rnUX8Xr0r5lgPNIO
+Nsgop/aRQ/bfYNZfMP7kNLooq9efMPoxqaaCysMa+IjkCaCowladoQRtaWGp/iVM
+hjwE/l/oEASe8NDUUqk2w2SdNos6Cm9sj00TfCBqMhOKkAxbEZWMJxJ73hXYbkTt
+I/5rVj2dqE7YVCO2umExe91enQKBgQD6Uue+7iFdp77aghScEic109pEXoDfdcoa
+6ThDuroSb+f/YIl5na8IrXYQve40ycf2O9z3M2Sg9GczYqfSL1wMaVnkGUgkihJN
+W5yhDpqfkNMVJLQLTzX3dNQ3y10+XAneSuclY5gH0RBp4vfnn1r7vrP+ZhFx9khi
+aNyQbhS/QQKBgAz6dUN9FBGQ+c7at0FXIrvAHmrc6u4btF2PStMDy9OJOgua3Ikv
+sFg7KSi/T08HFJNIJHXavUDw4MaNSt8QYBEeHlcEZUjZTOaBNROJwC7HgSPLIIOt
+U587oO3+k7ZryMf6PBTafQF+uQDQjK7+WxCxkVUVPqfCi2rNcXS/ZfGdAoGAH9zp
+rr309Uzi2EFyiiMtZoae49D7qnX90csZ5FUiVjJ0X2dUWGyf2QTrYFostf9xOoCI
+MdcS2gICGOJX5kMs/k9yp7woGK6SgdJFb6LCP8lZdPmFCWN9xQ/T634xUjy47Niv
+72xr76LG6hN/5rW8CQtPMfSgB9eHgy9B1AiPD4ECgYBOyipIZ9YJG/gcOmWqgRdv
+22lD8nl0hU7El4gHhWYzABApglpCwwcE+GLK9h/9KZbOEIQs7itzZFEQCX1VbuUo
+8+JWR8ZsimMSmLb5ySF3hMbevaA6iYNjjpvDy1syFNW+WVefp7nf1zQB4qRMW1vb
+p0dF88DF/NJK1kAC2RBZew==
+-----END PRIVATE KEY-----
diff --git a/demo-exporter/templates/_helpers.tpl b/demo-exporter/templates/_helpers.tpl
new file mode 100644
index 0000000..5907a5b
--- /dev/null
+++ b/demo-exporter/templates/_helpers.tpl
@@ -0,0 +1,56 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
+SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+Expand the name of the chart.
+*/}}
+{{- define "demo-exporter.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "demo-exporter.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "demo-exporter.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{/*
+Common labels
+*/}}
+{{- define "demo-exporter.labels" -}}
+helm.sh/chart: {{ include "demo-exporter.chart" . }}
+{{ include "demo-exporter.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
+{{/*
+Selector labels
+*/}}
+{{- define "demo-exporter.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "demo-exporter.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end -}}
diff --git a/demo-exporter/templates/deployment.yaml b/demo-exporter/templates/deployment.yaml
new file mode 100644
index 0000000..7846122
--- /dev/null
+++ b/demo-exporter/templates/deployment.yaml
@@ -0,0 +1,66 @@
+# SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ template "demo-exporter.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    name: {{ template "demo-exporter.fullname" . }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "demo-exporter.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        name: {{ template "demo-exporter.fullname" . }}
+        {{- include "demo-exporter.selectorLabels" . | nindent 8 }}
+    spec:
+    {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 6 }}
+    {{- end }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+          args:
+            - "/usr/local/bin/sdcore-exporter"
+          ports:
+            - name: metrics
+              containerPort: 2112
+          readinessProbe:
+            httpGet:
+              path: /metrics
+              port: 2112
+            initialDelaySeconds: 5
+            periodSeconds: 10
+          livenessProbe:
+            httpGet:
+              path: /metrics
+              port: 2112
+            initialDelaySeconds: 15
+            periodSeconds: 20
+      volumes:
+        - name: secret
+          secret:
+            secretName: {{ template "demo-exporter.fullname" . }}-secret
diff --git a/demo-exporter/templates/secret.yaml b/demo-exporter/templates/secret.yaml
new file mode 100644
index 0000000..6365a60
--- /dev/null
+++ b/demo-exporter/templates/secret.yaml
@@ -0,0 +1,18 @@
+# SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "demo-exporter.fullname" . }}-secret
+  labels:
+     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+     release: "{{ .Release.Name }}"
+     heritage: "{{ .Release.Service }}"
+data:
+  {{ $root := . }}
+  {{ range $path, $bytes := .Files.Glob "files/certs/tls.*" }}
+  {{ base $path }}: '{{ $root.Files.Get $path | b64enc }}'
+  {{ end }}
+type: Opaque
diff --git a/demo-exporter/templates/service.yaml b/demo-exporter/templates/service.yaml
new file mode 100644
index 0000000..880d333
--- /dev/null
+++ b/demo-exporter/templates/service.yaml
@@ -0,0 +1,22 @@
+# SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "demo-exporter.fullname" . }}
+  labels:
+    app: {{ template "demo-exporter.fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+    {{- include "demo-exporter.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  selector:
+    name: {{ template "demo-exporter.fullname" . }}
+  ports:
+  - name: metrics
+    port: 2112
+  - name: exporterui
+    port: 8081
diff --git a/demo-exporter/values.yaml b/demo-exporter/values.yaml
new file mode 100644
index 0000000..f92e9c9
--- /dev/null
+++ b/demo-exporter/values.yaml
@@ -0,0 +1,18 @@
+# SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+nameOverride: ""
+fullnameOverride: "demo-exporter"
+
+replicaCount: 1
+annotations: {}
+
+image:
+  repository: onosproject/sdcore-adapter
+  tag: v0.2.12
+  pullPolicy: IfNotPresent
+  pullSecrets: []
+
+service:
+  type: ClusterIP
diff --git a/sdcore-adapter-v4/Chart.yaml b/sdcore-adapter-v4/Chart.yaml
index 9b49d83..2708eed 100644
--- a/sdcore-adapter-v4/Chart.yaml
+++ b/sdcore-adapter-v4/Chart.yaml
@@ -6,13 +6,14 @@
 name: sdcore-adapter-v4
 kubeVersion: ">=1.17.0"
 type: application
-version: 4.0.11
+version: 4.0.12
 appVersion: v4.0.0
-description: ONOS SD-Core Adapter
+description: Aether SD-Core Adapter
 keywords:
-  - onos
-  - sdn
-home: https://onosproject.org
+  - aether
+  - sdcore
+  - adapter
+home: https://www.opennetworking.org/aether/
 maintainers:
-  - name: ONOS Support
+  - name: Aether Ops team
     email: support@opennetworking.org
diff --git a/sdcore-adapter-v4/templates/deployment.yaml b/sdcore-adapter-v4/templates/deployment.yaml
index e381db6..a6a5ba8 100644
--- a/sdcore-adapter-v4/templates/deployment.yaml
+++ b/sdcore-adapter-v4/templates/deployment.yaml
@@ -86,39 +86,6 @@
             - name: logconfig
               mountPath: /etc/onos/config
               readOnly: true
-        - name: {{ .Chart.Name }}-exporter
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          env:
-            - name: POD_NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: POD_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.name
-            - name: NODE_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
-          args:
-            - "/usr/local/bin/sdcore-exporter"
-          ports:
-            - name: metrics
-              containerPort: 2112
-          readinessProbe:
-            httpGet:
-              path: /metrics
-              port: 2112
-            initialDelaySeconds: 5
-            periodSeconds: 10
-          livenessProbe:
-            httpGet:
-              path: /metrics
-              port: 2112
-            initialDelaySeconds: 15
-            periodSeconds: 20
       volumes:
         - name: logconfig
           configMap:
diff --git a/sdcore-adapter-v4/templates/service.yaml b/sdcore-adapter-v4/templates/service.yaml
index a266be4..42aa78a 100644
--- a/sdcore-adapter-v4/templates/service.yaml
+++ b/sdcore-adapter-v4/templates/service.yaml
@@ -25,23 +25,3 @@
       port: {{ .Values.ports.prometheus }}
     - name: diag-api
       port: {{ .Values.ports.diagApi }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "sdcore-adapter.fullname" . }}-exporter
-  labels:
-    app: {{ template "sdcore-adapter.fullname" . }}-exporter
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-    {{- include "sdcore-adapter.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  selector:
-    name: {{ template "sdcore-adapter.fullname" . }}
-  ports:
-  - name: metrics
-    port: 2112
-  - name: exporterui
-    port: 8081