diff --git a/hackfest_basic_vnf/hackfest_basic_vnfd.yaml b/hackfest_basic_vnf/hackfest_basic_vnfd.yaml
index 25676ef8b1490d7397d9893e1ffb35593d34fa72..df31a8d2a36e99a8f09b8438e13141e534519dd4 100644
--- a/hackfest_basic_vnf/hackfest_basic_vnfd.yaml
+++ b/hackfest_basic_vnf/hackfest_basic_vnfd.yaml
@@ -19,29 +19,29 @@ vnfd:
   mgmt-cp: vnf-cp0-ext
   product-name: hackfest_basic-vnf
   sw-image-desc:
-  - id: ubuntu18.04
-    name: ubuntu18.04
-    image: ubuntu18.04
-  - id: ubuntu18.04-aws
-    name: ubuntu18.04-aws
+  - id: ubuntu20.04
+    image: ubuntu20.04
+    name: ubuntu20.04
+  - id: ubuntu20.04-aws
+    name: ubuntu20.04-aws
     image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
     vim-type: aws
-  - id: ubuntu18.04-azure
-    name: ubuntu18.04-azure
-    image: Canonical:UbuntuServer:18.04-LTS:latest
+  - id: ubuntu20.04-azure
+    name: ubuntu20.04-azure
+    image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest
     vim-type: azure
-  - id: ubuntu18.04-gcp
-    name: ubuntu18.04-gcp
-    image: ubuntu-os-cloud:image-family:ubuntu-1804-lts
+  - id: ubuntu20.04-gcp
+    name: ubuntu20.04-gcp
+    image: ubuntu-os-cloud:image-family:ubuntu-2004-lts
     vim-type: gcp
   vdu:
   - id: hackfest_basic-VM
     name: hackfest_basic-VM
-    sw-image-desc: ubuntu18.04
+    sw-image-desc: ubuntu20.04
     alternative-sw-image-desc:
-    - ubuntu18.04-aws
-    - ubuntu18.04-azure
-    - ubuntu18.04-gcp
+    - ubuntu20.04-aws
+    - ubuntu20.04-azure
+    - ubuntu20.04-gcp
     virtual-compute-desc: hackfest_basic-VM-compute
     virtual-storage-desc:
     - hackfest_basic-VM-storage
@@ -61,3 +61,4 @@ vnfd:
   virtual-storage-desc:
   - id: hackfest_basic-VM-storage
     size-of-storage: 10
+
diff --git a/hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml b/hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml
index 8f9b1dccb5201414e91bb1e1f9244c2a6045d1db..6070b49732d2b9eb06a93a0b8980fb73e7f9c1c2 100644
--- a/hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml
+++ b/hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml
@@ -30,20 +30,20 @@ vnfd:
   mgmt-cp: vnf-mgmt-ext
   product-name: hackfest_cloudinit-vnf
   sw-image-desc:
-  - id: ubuntu18.04
-    image: ubuntu18.04
-    name: ubuntu18.04
-  - id: ubuntu18.04-aws
-    name: ubuntu18.04-aws
+  - id: ubuntu20.04
+    image: ubuntu20.04
+    name: ubuntu20.04
+  - id: ubuntu20.04-aws
+    name: ubuntu20.04-aws
     image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
     vim-type: aws
-  - id: ubuntu18.04-azure
-    name: ubuntu18.04-azure
-    image: Canonical:UbuntuServer:18.04-LTS:latest
+  - id: ubuntu20.04-azure
+    name: ubuntu20.04-azure
+    image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest
     vim-type: azure
-  - id: ubuntu18.04-gcp
-    name: ubuntu18.04-gcp
-    image: ubuntu-os-cloud:image-family:ubuntu-1804-lts
+  - id: ubuntu20.04-gcp
+    name: ubuntu20.04-gcp
+    image: ubuntu-os-cloud:image-family:ubuntu-2004-lts
     vim-type: gcp
   vdu:
   - cloud-init-file: cloud-config.txt
@@ -63,11 +63,11 @@ vnfd:
         virtual-interface:
           type: PARAVIRT
     name: mgmtVM
-    sw-image-desc: ubuntu18.04
+    sw-image-desc: ubuntu20.04
     alternative-sw-image-desc:
-    - ubuntu18.04-aws
-    - ubuntu18.04-azure
-    - ubuntu18.04-gcp
+    - ubuntu20.04-aws
+    - ubuntu20.04-azure
+    - ubuntu20.04-gcp
     virtual-compute-desc: mgmtVM-compute
     virtual-storage-desc:
     - mgmtVM-storage
@@ -87,11 +87,11 @@ vnfd:
         virtual-interface:
           type: PARAVIRT
     name: dataVM
-    sw-image-desc: ubuntu18.04
+    sw-image-desc: ubuntu20.04
     alternative-sw-image-desc:
-    - ubuntu18.04-aws
-    - ubuntu18.04-azure
-    - ubuntu18.04-gcp
+    - ubuntu20.04-aws
+    - ubuntu20.04-azure
+    - ubuntu20.04-gcp
     virtual-compute-desc: dataVM-compute
     virtual-storage-desc:
     - dataVM-storage