diff --git a/keep_persistent_volume_ns/keep_persistent_volume_nsd.yaml b/keep_persistent_volume_ns/keep_persistent_volume_nsd.yaml
new file mode 100755
index 0000000000000000000000000000000000000000..f40666231a8a119282dc4aa9f9fd07f7c7d9bfec
--- /dev/null
+++ b/keep_persistent_volume_ns/keep_persistent_volume_nsd.yaml
@@ -0,0 +1,21 @@
+nsd:
+  nsd:
+  - description: NS with 1 VNFs connected to mgmtnet VL
+    df:
+    - id: default-df
+      vnf-profile:
+      - id: vnf-persistent-volumes
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: vnf-persistent-volumes
+            constituent-cpd-id: vnf-mgmt-ext
+          virtual-link-profile-id: mgmtnet
+        vnfd-id: keep_persistent-volumes-vnf
+    id: persistent_volumes-ns
+    name: persistent_volumes-ns
+    version: 1.0
+    virtual-link-desc:
+    - id: mgmtnet
+      mgmt-network: true
+    vnfd-id:
+    - keep_persistent-volumes-vnf
diff --git a/keep_persistent_volume_vnf/cloud_init/cloud-config.txt b/keep_persistent_volume_vnf/cloud_init/cloud-config.txt
new file mode 100755
index 0000000000000000000000000000000000000000..f1c055b488a1317c110ff1eaa81395e5bf5de99f
--- /dev/null
+++ b/keep_persistent_volume_vnf/cloud_init/cloud-config.txt
@@ -0,0 +1,5 @@
+#cloud-config
+password: osm4u
+chpasswd: { expire: False }
+ssh_pwauth: True
+
diff --git a/keep_persistent_volume_vnf/icons/osm.png b/keep_persistent_volume_vnf/icons/osm.png
new file mode 100644
index 0000000000000000000000000000000000000000..62012d2a2b491bdcd536d62c3c3c863c0d8c1b33
Binary files /dev/null and b/keep_persistent_volume_vnf/icons/osm.png differ
diff --git a/keep_persistent_volume_vnf/keep_persistent_volume_vnfd.yaml b/keep_persistent_volume_vnf/keep_persistent_volume_vnfd.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..be8fc18089be2cb3a4c9a47b42765ae6df5eac0e
--- /dev/null
+++ b/keep_persistent_volume_vnf/keep_persistent_volume_vnfd.yaml
@@ -0,0 +1,77 @@
+vnfd:
+  description: A basic VNF descriptor w/ one VDU and several volumes, keeping persistent volume
+  df:
+  - id: default-df
+    instantiation-level:
+    - id: default-instantiation-level
+      vdu-level:
+      - number-of-instances: 1
+        vdu-id: keep-persistent-vol-VM
+    vdu-profile:
+    - id: keep-persistent-vol-VM
+      min-number-of-instances: 1
+  ext-cpd:
+  - id: vnf-mgmt-ext
+    int-cpd:
+      cpd: vdu-eth0-int
+      vdu-id: keep-persistent-vol-VM
+  id: keep_persistent-volumes-vnf
+  mgmt-cp: vnf-mgmt-ext
+  product-name: keep_persistent-volumes-vnf
+  sw-image-desc:
+  - id: ubuntu20.04
+    name: ubuntu20.04
+    image: ubuntu20.04
+  - id: ubuntu20.04-aws
+    name: ubuntu20.04-aws
+    image: ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210503
+    vim-type: aws
+  - id: ubuntu20.04-azure
+    name: ubuntu20.04-azure
+    image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest
+    vim-type: azure
+  - id: ubuntu20.04-gcp
+    name: ubuntu20.04-gcp
+    image: ubuntu-os-cloud:image-family:ubuntu-2004-lts
+    vim-type: gcp
+  vdu:
+  - id: keep-persistent-vol-VM
+    name: keep-persistent-vol-VM
+    sw-image-desc: ubuntu20.04
+    alternative-sw-image-desc:
+    - ubuntu20.04-aws
+    - ubuntu20.04-azure
+    virtual-compute-desc: keep-persistent-vol-VM-compute
+    virtual-storage-desc:
+    - root-volume
+    - persistent-volume
+    - ephemeral-volume
+    int-cpd:
+    - id: vdu-eth0-int
+      virtual-network-interface-requirement:
+      - name: vdu-eth0
+        virtual-interface:
+          type: PARAVIRT
+  version: 1.0
+  virtual-compute-desc:
+  - id: keep-persistent-vol-VM-compute
+    virtual-cpu:
+      num-virtual-cpu: 1
+    virtual-memory:
+      size: 1.0
+  virtual-storage-desc:
+  - id: root-volume
+    type-of-storage: persistent-storage
+    size-of-storage: 10
+    vdu-storage-requirements:
+      - key: keep-volume
+        value: 'true'
+  - id: persistent-volume
+    type-of-storage: persistent-storage
+    size-of-storage: 1
+    vdu-storage-requirements:
+      - key: keep-volume
+        value: 'true'
+  - id: ephemeral-volume
+    type-of-storage: ephemeral-storage
+    size-of-storage: 2