diff --git a/Hackfest_Demos/OSM-13/magma_orc_cnf/juju-bundles/bundle.yaml b/Hackfest_Demos/OSM-13/magma_orc_cnf/juju-bundles/bundle.yaml
index fc03dfec14ca785e523e13cc22140ac14465a0fb..27baf2dc18920faaaaff4ef6b3e553fcd318ec4f 100644
--- a/Hackfest_Demos/OSM-13/magma_orc_cnf/juju-bundles/bundle.yaml
+++ b/Hackfest_Demos/OSM-13/magma_orc_cnf/juju-bundles/bundle.yaml
@@ -1,23 +1,23 @@
 bundle: kubernetes
 name: magma-orc8r
 description: |
-  Orchestrator is a Magma service that provides a simple and consistent way to 
-  configure and monitor the wireless network securely. The metrics acquired through the platform 
+  Orchestrator is a Magma service that provides a simple and consistent way to
+  configure and monitor the wireless network securely. The metrics acquired through the platform
   allows you to see the analytics and traffic flows of the wireless users through the Magma web UI.
 applications:
   nms-magmalte:
     charm: magma-nms-magmalte
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
   nms-nginx-proxy:
     charm: magma-nms-nginx-proxy
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
   orc8r-accessd:
     charm: magma-orc8r-accessd
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
   orc8r-alertmanager:
@@ -27,88 +27,90 @@ applications:
     trust: true
   orc8r-analytics:
     charm: magma-orc8r-analytics
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
   orc8r-bootstrapper:
     charm: magma-orc8r-bootstrapper
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
   orc8r-certifier:
     charm: magma-orc8r-certifier
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
     options:
-      domain: team1.osmhackfest.com
+      domain: osm.magma.com
   orc8r-configurator:
     charm: magma-orc8r-configurator
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
   orc8r-ctraced:
     charm: magma-orc8r-ctraced
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
   orc8r-device:
     charm: magma-orc8r-device
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
   orc8r-directoryd:
     charm: magma-orc8r-directoryd
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
   orc8r-dispatcher:
     charm: magma-orc8r-dispatcher
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
   orc8r-eventd:
     charm: magma-orc8r-eventd
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
     options:
       elasticsearch-url: "orc8r-elasticsearch:1234"
   orc8r-ha:
     charm: magma-orc8r-ha
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
   orc8r-lte:
     charm: magma-orc8r-lte
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
   orc8r-metricsd:
     charm: magma-orc8r-metricsd
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
   orc8r-nginx:
     charm: magma-orc8r-nginx
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
+    options:
+      domain: osm.magma.com
   orc8r-obsidian:
     charm: magma-orc8r-obsidian
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
   orc8r-orchestrator:
     charm: magma-orc8r-orchestrator
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
     options:
       elasticsearch-url: "orc8r-elasticsearch:1234"
   orc8r-policydb:
     charm: magma-orc8r-policydb
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
   orc8r-prometheus:
@@ -123,39 +125,44 @@ applications:
     trust: true
     options:
       metrics_count_limit: 500000
+  orc8r-prometheus-configurer:
+    charm: prometheus-configurer-k8s
+    channel: edge
+    scale: 1
+    trust: true
   orc8r-service-registry:
     charm: magma-orc8r-service-registry
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
   orc8r-smsd:
     charm: magma-orc8r-smsd
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
   orc8r-state:
     charm: magma-orc8r-state
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
   orc8r-streamer:
     charm: magma-orc8r-streamer
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
   orc8r-subscriberdb:
     charm: magma-orc8r-subscriberdb
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
   orc8r-subscriberdb-cache:
     charm: magma-orc8r-subscriberdb-cache
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
   orc8r-tenants:
     charm: magma-orc8r-tenants
-    channel: edge
+    channel: beta
     scale: 1
     trust: true
   orc8r-user-grafana:
@@ -171,19 +178,26 @@ applications:
     channel: stable
     scale: 1
     trust: true
+  tls-certificates-operator:
+    charm: tls-certificates-operator
+    channel: edge
+    scale: 1
+    options:
+      generate-self-signed-certificates: true
+      ca-common-name: rootca.osm.magma.com
 relations:
-- - nms-magmalte:magma-orc8r-certifier
-  - orc8r-certifier:magma-orc8r-certifier
+- - nms-magmalte
+  - orc8r-certifier
 - - nms-magmalte:db
   - postgresql-k8s:db
-- - nms-nginx-proxy:magma-orc8r-certifier
-  - orc8r-certifier:magma-orc8r-certifier
-- - nms-nginx-proxy:magmalte
-  - nms-magmalte:magmalte
+- - nms-nginx-proxy
+  - orc8r-certifier
+- - nms-nginx-proxy:magma-nms-magmalte
+  - nms-magmalte:magma-nms-magmalte
 - - orc8r-accessd:db
   - postgresql-k8s:db
-- - orc8r-bootstrapper:magma-orc8r-certifier
-  - orc8r-certifier:magma-orc8r-certifier
+- - orc8r-certifier
+  - tls-certificates-operator
 - - orc8r-certifier:db
   - postgresql-k8s:db
 - - orc8r-configurator:db
@@ -196,24 +210,40 @@ relations:
   - postgresql-k8s:db
 - - orc8r-lte:db
   - postgresql-k8s:db
-- - orc8r-nginx:bootstrapper
-  - orc8r-bootstrapper:bootstrapper
-- - orc8r-nginx:magma-orc8r-certifier
-  - orc8r-certifier:magma-orc8r-certifier
-- - orc8r-nginx:obsidian
-  - orc8r-obsidian:obsidian
+- - orc8r-metricsd:alertmanager-k8s
+  - orc8r-alertmanager:alerting
+- - orc8r-metricsd:magma-orc8r-orchestrator
+  - orc8r-orchestrator:magma-orc8r-orchestrator
+- - orc8r-metricsd:prometheus-k8s
+  - orc8r-prometheus:self-metrics-endpoint
+- - orc8r-metricsd:prometheus-configurer-k8s
+  - orc8r-prometheus-configurer:prometheus-configurer
+- - orc8r-nginx:magma-orc8r-bootstrapper
+  - orc8r-bootstrapper:magma-orc8r-bootstrapper
+- - orc8r-nginx:cert-certifier
+  - orc8r-certifier:cert-certifier
+- - orc8r-nginx:cert-controller
+  - orc8r-certifier:cert-controller
+- - orc8r-nginx:magma-orc8r-obsidian
+  - orc8r-obsidian:magma-orc8r-obsidian
+- - orc8r-orchestrator:cert-admin-operator
+  - orc8r-certifier:cert-admin-operator
 - - orc8r-orchestrator:magma-orc8r-certifier
   - orc8r-certifier:magma-orc8r-certifier
+- - orc8r-orchestrator:magma-orc8r-accessd
+  - orc8r-accessd:magma-orc8r-accessd
+- - orc8r-orchestrator:magma-orc8r-service-registry
+  - orc8r-service-registry:magma-orc8r-service-registry
 - - orc8r-orchestrator:metrics-endpoint
   - orc8r-prometheus-cache:metrics-endpoint
 - - orc8r-policydb:db
   - postgresql-k8s:db
 - - orc8r-prometheus:alertmanager
   - orc8r-alertmanager:alerting
-- - orc8r-prometheus
-  - orc8r-prometheus-cache
-- - orc8r-prometheus
-  - orc8r-user-grafana
+- - orc8r-prometheus:metrics-endpoint
+  - orc8r-prometheus-cache:metrics-endpoint
+- - orc8r-prometheus-configurer:prometheus
+  - orc8r-prometheus:receive-remote-write
 - - orc8r-smsd:db
   - postgresql-k8s:db
 - - orc8r-state:db
@@ -224,3 +254,5 @@ relations:
   - postgresql-k8s:db
 - - orc8r-tenants:db
   - postgresql-k8s:db
+- - orc8r-user-grafana:grafana-source
+  - orc8r-prometheus:grafana-source
diff --git a/Hackfest_Demos/OSM-13/magma_orc_cnf/magma_orc_vnfd.yaml b/Hackfest_Demos/OSM-13/magma_orc_cnf/magma_orc_vnfd.yaml
index d9f8c4068529f13945c3206f037f6eb582800953..3267bbf1cafb4b6b410eb26206416523ceeacfbd 100644
--- a/Hackfest_Demos/OSM-13/magma_orc_cnf/magma_orc_vnfd.yaml
+++ b/Hackfest_Demos/OSM-13/magma_orc_cnf/magma_orc_vnfd.yaml
@@ -20,16 +20,19 @@ vnfd:
         operate-vnf-op-config:
           day1-2:
             - id: magma-orc-kdu
-              initial-config-primitive:
-                - seq: 0
-                  name: create-orchestrator-admin-user
+              config-primitive:
+                - name: get-master-admin-credentials
                   parameter:
                     - name: application-name
                       data-type: STRING
-                      value: orc8r-orchestrator
-              config-primitive:
-                - name: get-admin-credentials
+                      default-value: nms-magmalte
+                - name: get-pfx-package-password
                   parameter:
                     - name: application-name
                       data-type: STRING
-                      default-value: nms-magmalte
+                      default-value: orc8r-certifier
+                - name: get-load-balancer-services
+                  parameter:
+                    - name: application-name
+                      data-type: STRING
+                      default-value: orc8r-orchestrator