diff --git a/charm-packages/kamailio/kamailio_knf/juju-bundles/bundle.yaml b/charm-packages/kamailio/kamailio_knf/juju-bundles/bundle.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5c5635a245bc05176d3df3341e29dfd36a67635e
--- /dev/null
+++ b/charm-packages/kamailio/kamailio_knf/juju-bundles/bundle.yaml
@@ -0,0 +1,17 @@
+bundle: kubernetes
+applications:
+  kamailio:
+    charm: ./kamailio-k8s_ubuntu-20.04-amd64.charm
+    scale: 1
+    trust: true
+    options:
+      sip-domain: localhost
+    resources:
+      kamailio-image: kamailio/kamailio:5.3.3-stretch
+  sipp:
+    charm: ./sipp-k8s_ubuntu-20.04-amd64.charm
+    scale: 1
+    trust: true
+    options:
+    resources:
+      sipp-image: grigiu/sipp:latest
diff --git a/charm-packages/kamailio/kamailio_knf/juju-bundles/kamailio-k8s_ubuntu-20.04-amd64.charm b/charm-packages/kamailio/kamailio_knf/juju-bundles/kamailio-k8s_ubuntu-20.04-amd64.charm
new file mode 100644
index 0000000000000000000000000000000000000000..2f701624fe9be0678eba8fdae8583f9c30cdce3f
Binary files /dev/null and b/charm-packages/kamailio/kamailio_knf/juju-bundles/kamailio-k8s_ubuntu-20.04-amd64.charm differ
diff --git a/charm-packages/kamailio/kamailio_knf/juju-bundles/sipp-k8s_ubuntu-20.04-amd64.charm b/charm-packages/kamailio/kamailio_knf/juju-bundles/sipp-k8s_ubuntu-20.04-amd64.charm
new file mode 100644
index 0000000000000000000000000000000000000000..2ec38cca5ed6bb33518796652795d5f105d19501
Binary files /dev/null and b/charm-packages/kamailio/kamailio_knf/juju-bundles/sipp-k8s_ubuntu-20.04-amd64.charm differ
diff --git a/charm-packages/kamailio/kamailio_knf/kamailio_cnfd.yaml b/charm-packages/kamailio/kamailio_knf/kamailio_cnfd.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..50425957154fb1cc163f92cbf1dcb1eb29dc17c8
--- /dev/null
+++ b/charm-packages/kamailio/kamailio_knf/kamailio_cnfd.yaml
@@ -0,0 +1,45 @@
+vnfd:
+  id: kamailio_cnf
+  product-name: kamailio_cnf
+  mgmt-cp: mgmt-ext
+  k8s-cluster:
+    nets:
+      - id: mgmtnet
+  ext-cpd:
+    - id: mgmt-ext
+      k8s-cluster-net: mgmtnet
+  kdu:
+    - name: kamailio-kdu
+      juju-bundle: bundle.yaml
+  df:
+    - id: default-df
+      lcm-operations-configuration:
+        operate-vnf-op-config:
+          day1-2:
+            - id: kamailio-kdu
+              config-primitive:
+                - name: options
+                  parameter:
+                    - name: application-name
+                      data-type: STRING
+                      default-value: sipp
+                    - name: ip
+                      data-type: STRING
+                    - name: port
+                      data-type: INTEGER
+                      default-value: 5060
+                - name: restart
+                  parameter:
+                    - name: application-name
+                      data-type: STRING
+                      default-value: kamailio
+                - name: start
+                  parameter:
+                    - name: application-name
+                      data-type: STRING
+                      default-value: kamailio
+                - name: stop
+                  parameter:
+                    - name: application-name
+                      data-type: STRING
+                      default-value: kamailio
diff --git a/charm-packages/kamailio/kamailio_ns/kamailio_nsd.yaml b/charm-packages/kamailio/kamailio_ns/kamailio_nsd.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a4150f7e6be143d05df0850d3fada2f02bfcaa2d
--- /dev/null
+++ b/charm-packages/kamailio/kamailio_ns/kamailio_nsd.yaml
@@ -0,0 +1,21 @@
+nsd:
+  nsd:
+    - id: kamailio_ns
+      name: kamailio_ns
+      version: "1.0"
+      description: Kamailio Server and Sipp Client
+      vnfd-id:
+        - kamailio_cnf
+      virtual-link-desc:
+        - id: mgmtnet
+          mgmt-network: true
+      df:
+        - id: default-df
+          vnf-profile:
+            - id: kamailio
+              vnfd-id: kamailio_cnf
+              virtual-link-connectivity:
+                - virtual-link-profile-id: mgmtnet
+                  constituent-cpd-id:
+                    - constituent-base-element-id: kamailio
+                      constituent-cpd-id: mgmt-ext