diff --git a/chronos-exporter/Chart.yaml b/chronos-exporter/Chart.yaml
index dd9ad5a..217d7c0 100644
--- a/chronos-exporter/Chart.yaml
+++ b/chronos-exporter/Chart.yaml
@@ -7,8 +7,8 @@
 description: Chronos Exporter
 kubeVersion: ">=1.15.0"
 type: application
-version: 0.0.7
-appVersion: v0.0.6
+version: 0.0.8
+appVersion: v0.0.8
 keywords:
   - aether
   - exporter
diff --git a/chronos-exporter/files/configs/demo-configuration.yaml b/chronos-exporter/files/configs/demo-configuration.yaml
index 42ec3dd..cb94a99 100644
--- a/chronos-exporter/files/configs/demo-configuration.yaml
+++ b/chronos-exporter/files/configs/demo-configuration.yaml
@@ -4,11 +4,11 @@
 enterprise:
   enterprise-id: tesla
   display-name: Tesla
-  image: https://en.wikipedia.org/wiki/File:Tesla_Motors.svg
+  image: /chronos-exporter/images/tesla-logo.png
 sites:
   - site-id: freemont
     display-name: Freemont, CA
-    image: https://en.wikipedia.org/wiki/File:Mission_Peak_over_Lake_Elizabeth,_in_Fremont,_California_(cropped).JPG
+    image: chronos-exporter/images/los-angeles-us.png
     small-cells:
       - small-cell-id: freemont-sc-north
         display-name: North Cell
@@ -122,9 +122,42 @@
         display-name: Sim 2
       - iccid: 123-456-781
         display-name: Sim 1
+    site-plans:
+      isometric: true
+      origin: ORIGIN_TOP_LEFT
+      layers:
+        - layer-id: Small-Cells
+        - layer-id: Beams
+        - layer-id: Devices
+        - layer-id: Text
+      site-plan-list:
+        - id: floor-0
+          svg-file: /chronos-exporter/site-plans/freemont/floor-0.svg
+          offsets:
+            x-offset: 0
+            y-offset: 0
+            z-offset: 0
+        - id: floor-1
+          svg-file: /chronos-exporter/site-plans/freemont/floor-1.svg
+          offsets:
+            x-offset: 0
+            y-offset: 0
+            z-offset: 100
+        - id: floor-2
+          svg-file: /chronos-exporter/site-plans/freemont/floor-2.svg
+          offsets:
+            x-offset: 0
+            y-offset: 0
+            z-offset: 200
+        - id: floor-3
+          svg-file: /chronos-exporter/site-plans/freemont/floor-3.svg
+          offsets:
+            x-offset: 0
+            y-offset: 0
+            z-offset: 300
   - site-id: berlin
     display-name: Berlin, DE
-    image: https://en.wikipedia.org/wiki/Berlin#/media/File:Brandenburger_Tor_abends.jpg
+    image: /chronos-exporter/images/berlin-deutschland.png
     small-cells:
       - small-cell-id: berlin-sc-north
         display-name: North Cell
diff --git a/chronos-exporter/values.yaml b/chronos-exporter/values.yaml
index ccd4737..3d742fc 100644
--- a/chronos-exporter/values.yaml
+++ b/chronos-exporter/values.yaml
@@ -10,7 +10,7 @@
 
 image:
   repository: onosproject/chronos-exporter
-  tag: v0.0.6
+  tag: v0.0.8
   pullPolicy: IfNotPresent
   pullSecrets: []
 
diff --git a/chronos-umbrella/Chart.yaml b/chronos-umbrella/Chart.yaml
index abadd76..413015a 100644
--- a/chronos-umbrella/Chart.yaml
+++ b/chronos-umbrella/Chart.yaml
@@ -7,7 +7,7 @@
 description: Chronos Umbrella chart to deploy all Aether ROC
 kubeVersion: ">=1.18.0"
 type: application
-version: 0.1.3
+version: 0.1.4
 appVersion: v0.0.0
 keywords:
   - aether
@@ -29,7 +29,7 @@
   - name: chronos-exporter
     condition: import.chronos-exporter.enabled
     repository: "file://../chronos-exporter"
-    version: 0.0.7
+    version: 0.0.8
   - name: aether-enterprise-portal
     condition: import.aether-enterprise-portal.enabled
     repository: "file://../aether-enterprise-portal"
diff --git a/chronos-umbrella/values.yaml b/chronos-umbrella/values.yaml
index de3d6ec..b16d060 100644
--- a/chronos-umbrella/values.yaml
+++ b/chronos-umbrella/values.yaml
@@ -24,10 +24,10 @@
 aether-enterprise-portal:
   grafana:
     proxyEnabled: true
-    service: chronos-umbrella-grafana
+    service: chronos-grafana
   prometheus:
     proxyEnabled: true
-    service: chronos-umbrella-prometheus-chronos-server
+    service: chronos-prometheus-chronos-server
 
 grafana:
   image: