diff --git a/magma_orc_cnf/juju-bundles/bundle.yaml b/magma_orc_cnf/juju-bundles/bundle.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..dc7b0fd682e5e13ffc5af28e4d9ac3ebe2d05d51
--- /dev/null
+++ b/magma_orc_cnf/juju-bundles/bundle.yaml
@@ -0,0 +1,224 @@
+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 
+  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
+    scale: 1
+    trust: true
+  nms-nginx-proxy:
+    charm: magma-nms-nginx-proxy
+    channel: edge
+    scale: 1
+    trust: true
+  orc8r-accessd:
+    charm: magma-orc8r-accessd
+    channel: edge
+    scale: 1
+    trust: true
+  orc8r-alertmanager:
+    charm: alertmanager-k8s
+    channel: edge
+    scale: 1
+    trust: true
+  orc8r-analytics:
+    charm: magma-orc8r-analytics
+    channel: edge
+    scale: 1
+    trust: true
+  orc8r-bootstrapper:
+    charm: magma-orc8r-bootstrapper
+    channel: edge
+    scale: 1
+    trust: true
+  orc8r-certifier:
+    charm: magma-orc8r-certifier
+    channel: edge
+    scale: 1
+    trust: true
+    options:
+      domain: magma-orc.com
+  orc8r-configurator:
+    charm: magma-orc8r-configurator
+    channel: edge
+    scale: 1
+    trust: true
+  orc8r-ctraced:
+    charm: magma-orc8r-ctraced
+    channel: edge
+    scale: 1
+    trust: true
+  orc8r-device:
+    charm: magma-orc8r-device
+    channel: edge
+    scale: 1
+    trust: true
+  orc8r-directoryd:
+    charm: magma-orc8r-directoryd
+    channel: edge
+    scale: 1
+    trust: true
+  orc8r-dispatcher:
+    charm: magma-orc8r-dispatcher
+    channel: edge
+    scale: 1
+    trust: true
+  orc8r-eventd:
+    charm: magma-orc8r-eventd
+    channel: edge
+    scale: 1
+    trust: true
+    options:
+      elasticsearch-url: "orc8r-elasticsearch:1234"
+  orc8r-ha:
+    charm: magma-orc8r-ha
+    channel: edge
+    scale: 1
+    trust: true
+  orc8r-lte:
+    charm: magma-orc8r-lte
+    channel: edge
+    scale: 1
+    trust: true
+  orc8r-metricsd:
+    charm: magma-orc8r-metricsd
+    channel: edge
+    scale: 1
+    trust: true
+  orc8r-nginx:
+    charm: magma-orc8r-nginx
+    channel: edge
+    scale: 1
+    trust: true
+  orc8r-obsidian:
+    charm: magma-orc8r-obsidian
+    channel: edge
+    scale: 1
+    trust: true
+  orc8r-orchestrator:
+    charm: magma-orc8r-orchestrator
+    channel: edge
+    scale: 1
+    trust: true
+    options:
+      elasticsearch-url: "orc8r-elasticsearch:1234"
+  orc8r-policydb:
+    charm: magma-orc8r-policydb
+    channel: edge
+    scale: 1
+    trust: true
+  orc8r-prometheus:
+    charm: prometheus-k8s
+    channel: edge
+    scale: 1
+    trust: true
+  orc8r-prometheus-cache:
+    charm: prometheus-edge-hub
+    channel: edge
+    scale: 1
+    trust: true
+    options:
+      metrics_count_limit: 500000
+  orc8r-service-registry:
+    charm: magma-orc8r-service-registry
+    channel: edge
+    scale: 1
+    trust: true
+  orc8r-smsd:
+    charm: magma-orc8r-smsd
+    channel: edge
+    scale: 1
+    trust: true
+  orc8r-state:
+    charm: magma-orc8r-state
+    channel: edge
+    scale: 1
+    trust: true
+  orc8r-streamer:
+    charm: magma-orc8r-streamer
+    channel: edge
+    scale: 1
+    trust: true
+  orc8r-subscriberdb:
+    charm: magma-orc8r-subscriberdb
+    channel: edge
+    scale: 1
+    trust: true
+  orc8r-subscriberdb-cache:
+    charm: magma-orc8r-subscriberdb-cache
+    channel: edge
+    scale: 1
+    trust: true
+  orc8r-tenants:
+    charm: magma-orc8r-tenants
+    channel: edge
+    scale: 1
+    trust: true
+  orc8r-user-grafana:
+    charm: grafana-k8s
+    channel: edge
+    options:
+      web_external_url: "/grafana"
+    scale: 1
+    trust: true
+  postgresql-k8s:
+    charm: postgresql-k8s
+    series: kubernetes
+    channel: stable
+    scale: 1
+    trust: true
+relations:
+- - nms-magmalte:certifier
+  - orc8r-certifier:certifier
+- - nms-magmalte:db
+  - postgresql-k8s:db
+- - nms-nginx-proxy:certifier
+  - orc8r-certifier:certifier
+- - nms-nginx-proxy:magmalte
+  - nms-magmalte:magmalte
+- - orc8r-accessd:db
+  - postgresql-k8s:db
+- - orc8r-bootstrapper:certifier
+  - orc8r-certifier:certifier
+- - orc8r-certifier:db
+  - postgresql-k8s:db
+- - orc8r-configurator:db
+  - postgresql-k8s:db
+- - orc8r-ctraced:db
+  - postgresql-k8s:db
+- - orc8r-device:db
+  - postgresql-k8s:db
+- - orc8r-directoryd:db
+  - postgresql-k8s:db
+- - orc8r-lte:db
+  - postgresql-k8s:db
+- - orc8r-nginx:bootstrapper
+  - orc8r-bootstrapper:bootstrapper
+- - orc8r-nginx:certifier
+  - orc8r-certifier:certifier
+- - orc8r-nginx:obsidian
+  - orc8r-obsidian:obsidian
+- - orc8r-orchestrator:certifier
+  - orc8r-certifier:certifier
+- - orc8r-policydb:db
+  - postgresql-k8s:db
+- - orc8r-prometheus:alertmanager
+  - orc8r-alertmanager:alerting
+- - orc8r-prometheus
+  - orc8r-prometheus-cache
+- - orc8r-prometheus
+  - orc8r-user-grafana
+- - orc8r-smsd:db
+  - postgresql-k8s:db
+- - orc8r-state:db
+  - postgresql-k8s:db
+- - orc8r-subscriberdb-cache:db
+  - postgresql-k8s:db
+- - orc8r-subscriberdb:db
+  - postgresql-k8s:db
+- - orc8r-tenants:db
+  - postgresql-k8s:db
diff --git a/magma_orc_cnf/magma_orc_vnfd.yaml b/magma_orc_cnf/magma_orc_vnfd.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d9f8c4068529f13945c3206f037f6eb582800953
--- /dev/null
+++ b/magma_orc_cnf/magma_orc_vnfd.yaml
@@ -0,0 +1,35 @@
+vnfd:
+  product-name: magma_orc_cnf
+  version: "1.0"
+  provider: Canonical
+  description: "K8s container deployment of Magma Orchestrator"
+  id: magma_orc_cnf
+  mgmt-cp: mgmtnet-ext
+  ext-cpd:
+    - id: mgmtnet-ext
+      k8s-cluster-net: mgmtnet
+  kdu:
+    - name: magma-orc-kdu
+      juju-bundle: bundle.yaml
+  k8s-cluster:
+    nets:
+      - id: mgmtnet
+  df:
+    - id: default-df
+      lcm-operations-configuration:
+        operate-vnf-op-config:
+          day1-2:
+            - id: magma-orc-kdu
+              initial-config-primitive:
+                - seq: 0
+                  name: create-orchestrator-admin-user
+                  parameter:
+                    - name: application-name
+                      data-type: STRING
+                      value: orc8r-orchestrator
+              config-primitive:
+                - name: get-admin-credentials
+                  parameter:
+                    - name: application-name
+                      data-type: STRING
+                      default-value: nms-magmalte
diff --git a/magma_orc_ns/magma_orc_nsd.yaml b/magma_orc_ns/magma_orc_nsd.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..740429ce868151206f1d88f8de1427d46911e89b
--- /dev/null
+++ b/magma_orc_ns/magma_orc_nsd.yaml
@@ -0,0 +1,23 @@
+nsd:
+  nsd:
+  - description: NS with 1 KDU connected to the mgmtnet VL
+    designer: Canonical
+    df:
+    - id: default-df
+      vnf-profile:
+      - id: magma_orc_cnf
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: magma_orc_cnf
+            constituent-cpd-id: mgmtnet-ext
+          virtual-link-profile-id: mgmtnet
+        vnfd-id: magma_orc_cnf
+    id: magma_orc_cnf_ns
+    name: magma_orc_cnf_ns
+    version: 1.0
+    virtual-link-desc:
+    - id: mgmtnet
+      mgmt-network: true
+      vim-network-name: mgmt
+    vnfd-id:
+    - magma_orc_cnf