diff --git a/share/oneprovision/edge-clusters/virtual/description.md b/share/oneprovision/edge-clusters/virtual/description.md
index 296c530f23..6d5229f1da 100644
--- a/share/oneprovision/edge-clusters/virtual/description.md
+++ b/share/oneprovision/edge-clusters/virtual/description.md
@@ -1,6 +1,6 @@
 The virtual edge provision uses virtual instances (VMs) to build an **edge cluster**. This provision is useful for developing and testing or light workloads. It features the following characteristics:
 
-* Hosts are provisioned as metal instances in the selected provider.
+* Hosts are provisioned as VM instances in the selected provider.
 * Supported virtualization technologies: QEMU (nested virtualization) and LXC (system containers)
 * The provision includes a public network (Internet reachable IPs)
 * It also includes a virtual network template to create private VLANs. You need to instantiate this network template.
diff --git a/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-ams3.yml b/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-ams3.yml
index b94f51cc4b..2f8dcc5e4d 100644
--- a/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-ams3.yml
+++ b/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-ams3.yml
@@ -1,6 +1,6 @@
-name: 'digitalocean-nyc3'
+name: 'digitalocean-ams3'
 
-description: 'cluster on DigitalOcean in Amsterdam 3'
+description: 'Virtual Edge Cluster in DigitalOcean datacenter in Amsterdam (AMS3)'
 provider: 'digitalocean'
 
 plain:
@@ -16,4 +16,4 @@ inputs:
    - name: 'digitalocean_droplet'
      type: 'list'
      options:
-       - 'centos-7-x64'
+       - 'centos-8-x64'
diff --git a/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-lon1.yml b/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-lon1.yml
index b21b493474..224fdc9a44 100644
--- a/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-lon1.yml
+++ b/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-lon1.yml
@@ -1,6 +1,6 @@
-name: 'digitalocean-nyc3'
+name: 'digitalocean-lon1'
 
-description: 'cluster on DigitalOcean in London'
+description: 'Virtual Edge Cluster in DigitalOcean datacenter in London (LON1)'
 provider: 'digitalocean'
 
 plain:
@@ -16,4 +16,4 @@ inputs:
    - name: 'digitalocean_droplet'
      type: 'list'
      options:
-       - 'centos-7-x64'
+       - 'centos-8-x64'
diff --git a/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-nyc3.yml b/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-nyc3.yml
index 88d97ebfc6..22c4179ec5 100644
--- a/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-nyc3.yml
+++ b/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-nyc3.yml
@@ -1,6 +1,6 @@
 name: 'digitalocean-nyc3'
 
-description: 'cluster on DigitalOcean in New York 3'
+description: 'Virtual Edge Cluster in DigitalOcean datacenter in New York City (NYC3)'
 provider: 'digitalocean'
 
 plain:
@@ -16,4 +16,4 @@ inputs:
    - name: 'digitalocean_droplet'
      type: 'list'
      options:
-       - 'centos-7-x64'
+       - 'centos-8-x64'
diff --git a/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-sfo3.yml b/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-sfo3.yml
index ef4e277d12..9af290621c 100644
--- a/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-sfo3.yml
+++ b/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-sfo3.yml
@@ -1,6 +1,6 @@
-name: 'digitalocean-nyc3'
+name: 'digitalocean-sfo3'
 
-description: 'cluster on DigitalOcean in San Franciso 3'
+description: 'Virtual Edge Cluster in DigitalOcean datacenter in San Francisco (SFO3)'
 provider: 'digitalocean'
 
 plain:
@@ -16,4 +16,4 @@ inputs:
    - name: 'digitalocean_droplet'
      type: 'list'
      options:
-       - 'centos-7-x64'
+       - 'centos-8-x64'
diff --git a/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-sgp1.yml b/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-sgp1.yml
index 9d7feb2e86..5ddb937588 100644
--- a/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-sgp1.yml
+++ b/share/oneprovision/edge-clusters/virtual/providers/digitalocean/do-sgp1.yml
@@ -1,6 +1,6 @@
-name: 'digitalocean-nyc3'
+name: 'digitalocean-sgp1'
 
-description: 'cluster on DigitalOcean in Singapore'
+description: 'Virtual Edge Cluster in DigitalOcean datacenter in Singapore (SGP1)'
 provider: 'digitalocean'
 
 plain:
@@ -16,4 +16,4 @@ inputs:
    - name: 'digitalocean_droplet'
      type: 'list'
      options:
-       - 'centos-7-x64'
+       - 'centos-8-x64'
diff --git a/share/oneprovision/edge-clusters/virtual/providers/google/google-europe-west1-b.yml b/share/oneprovision/edge-clusters/virtual/providers/google/google-europe-west1-b.yml
index e6945a24d9..62b0f17788 100644
--- a/share/oneprovision/edge-clusters/virtual/providers/google/google-europe-west1-b.yml
+++ b/share/oneprovision/edge-clusters/virtual/providers/google/google-europe-west1-b.yml
@@ -1,6 +1,6 @@
 name: 'google-belgium'
 
-description: 'Elastic cluster on Google in Belgium'
+description: 'Virtual Edge Cluster in Google Belgium (europe-west1-b)'
 provider: 'google'
 
 plain:
diff --git a/share/oneprovision/edge-clusters/virtual/providers/google/google-europe-west2-b.yml b/share/oneprovision/edge-clusters/virtual/providers/google/google-europe-west2-b.yml
index 1b298144cd..0874cc8255 100644
--- a/share/oneprovision/edge-clusters/virtual/providers/google/google-europe-west2-b.yml
+++ b/share/oneprovision/edge-clusters/virtual/providers/google/google-europe-west2-b.yml
@@ -1,6 +1,6 @@
 name: 'google-london'
 
-description: 'Elastic cluster on Google in London'
+description: 'Virtual Edge Cluster in Google London (europe-west2-b)'
 provider: 'google'
 
 plain:
diff --git a/share/oneprovision/edge-clusters/virtual/providers/google/google-us-east1-b.yml b/share/oneprovision/edge-clusters/virtual/providers/google/google-us-east1-b.yml
index 74e0e52832..c2883de452 100644
--- a/share/oneprovision/edge-clusters/virtual/providers/google/google-us-east1-b.yml
+++ b/share/oneprovision/edge-clusters/virtual/providers/google/google-us-east1-b.yml
@@ -1,6 +1,6 @@
 name: 'google-moncks'
 
-description: 'Elastic cluster on Google in Moncks'
+description: 'Virtual Edge Cluster in Google Moncks (us-east1-b)'
 provider: 'google'
 
 plain:
diff --git a/share/oneprovision/edge-clusters/virtual/providers/google/google-us-west1-b.yml b/share/oneprovision/edge-clusters/virtual/providers/google/google-us-west1-b.yml
index 3cddfbc3fc..3f7df1ed5a 100644
--- a/share/oneprovision/edge-clusters/virtual/providers/google/google-us-west1-b.yml
+++ b/share/oneprovision/edge-clusters/virtual/providers/google/google-us-west1-b.yml
@@ -1,6 +1,6 @@
 name: 'google-oregon'
 
-description: 'Elastic cluster on Google in Oregon'
+description: 'Virtual Edge Cluster in Google Oregon (us-west1-b)'
 provider: 'google'
 
 plain:
diff --git a/share/oneprovision/edge-clusters/virtual/provisions/aws.d/inputs.yml b/share/oneprovision/edge-clusters/virtual/provisions/aws.d/inputs.yml
index 962ea6813b..b304282027 100644
--- a/share/oneprovision/edge-clusters/virtual/provisions/aws.d/inputs.yml
+++ b/share/oneprovision/edge-clusters/virtual/provisions/aws.d/inputs.yml
@@ -44,6 +44,7 @@ inputs:
   - name: 'one_hypervisor'
     type: list
     description: "Virtualization technology for the cluster hosts"
+    default: 'lxc'
     options:
         - 'qemu'
         - 'lxc'
diff --git a/share/oneprovision/edge-clusters/virtual/provisions/common.d/hosts.yml b/share/oneprovision/edge-clusters/virtual/provisions/common.d/hosts.yml
index 040449cea2..a8774a12a9 100644
--- a/share/oneprovision/edge-clusters/virtual/provisions/common.d/hosts.yml
+++ b/share/oneprovision/edge-clusters/virtual/provisions/common.d/hosts.yml
@@ -19,7 +19,7 @@
 # hosts: AWS, Digital Ocean or Google servers
 # provision:
 #   - count: Number of servers to create
-#   - hostname: kvm-host1, kvm-host2 .... of the server
+#   - hostname: edge-vhost1, edge-vhost2 .... of the server
 #
 # You can define specific OpenNebula configuration attributes for all the hosts:
 #    - reserved_cpu: In percentage. It will be subtracted from the TOTAL CPU
diff --git a/share/oneprovision/edge-clusters/virtual/provisions/digitalocean.d/defaults.yml b/share/oneprovision/edge-clusters/virtual/provisions/digitalocean.d/defaults.yml
deleted file mode 100644
index 8b6295f4d8..0000000000
--- a/share/oneprovision/edge-clusters/virtual/provisions/digitalocean.d/defaults.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-# ---------------------------------------------------------------------------- #
-# Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                  #
-#                                                                              #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may      #
-# not use this file except in compliance with the License. You may obtain      #
-# a copy of the License at                                                     #
-#                                                                              #
-# http://www.apache.org/licenses/LICENSE-2.0                                   #
-#                                                                              #
-# Unless required by applicable law or agreed to in writing, software          #
-# distributed under the License is distributed on an "AS IS" BASIS,            #
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.     #
-# See the License for the specific language governing permissions and          #
-# limitations under the License.                                               #
-# ---------------------------------------------------------------------------- #
-
-#-------------------------------------------------------------------------------
-# defaults: Common configuration attributes for provision objects
-#--------------------------------------------------------------------------------
-# configuration: Ansible role parameters.
-#--------------------------------------------------------------------------------
-#   Check defaults/main.yml in each role for the available variables
-#-------------------------------------------------------------------------------
diff --git a/share/oneprovision/edge-clusters/virtual/provisions/digitalocean.d/inputs.yml b/share/oneprovision/edge-clusters/virtual/provisions/digitalocean.d/inputs.yml
index a4682115b7..b564b19010 100644
--- a/share/oneprovision/edge-clusters/virtual/provisions/digitalocean.d/inputs.yml
+++ b/share/oneprovision/edge-clusters/virtual/provisions/digitalocean.d/inputs.yml
@@ -18,27 +18,23 @@
 inputs:
   - name: 'number_hosts'
     type: text
-    description: "Number of metal servers to create"
-    default: '1'
-
-  - name: 'number_public_ips'
-    type: text
-    description: 'Number of public IPs to get'
+    description: "Number of Droplets to create"
     default: '1'
 
   - name: 'digitalocean_image'
     type: text
-    description: "digitalocean host operating system"
+    description: "Droplet host operating system"
     default: 'centos-8-x64'
 
   - name: 'digitalocean_size'
     type: text
-    description: "digitalocean host size"
+    description: "Droplet size"
     default: 's-1vcpu-1gb'
 
   - name: 'one_hypervisor'
     type: list
     description: "Virtualization technology for the cluster hosts"
+    default: 'lxc'
     options:
         - 'qemu'
         - 'lxc'
diff --git a/share/oneprovision/edge-clusters/virtual/provisions/digitalocean.yml b/share/oneprovision/edge-clusters/virtual/provisions/digitalocean.yml
index d6c637507f..5256e2ebf4 100644
--- a/share/oneprovision/edge-clusters/virtual/provisions/digitalocean.yml
+++ b/share/oneprovision/edge-clusters/virtual/provisions/digitalocean.yml
@@ -27,21 +27,13 @@ extends:
     - common.d/resources.yml
     - common.d/hosts.yml
     - digitalocean.d/datastores.yml
-    - digitalocean.d/defaults.yml
     - digitalocean.d/fireedge.yml
     - digitalocean.d/inputs.yml
     - digitalocean.d/networks.yml
 
 #-------------------------------------------------------------------------------
-# playbook: Ansible playbook used for hosts configuration.The digitalocean playbook
-# include the following roles:
-#    - ddc
-#    - opennebula-repository
-#    - opennebula-node-kvm
-#    - opennebula-ssh
-#    - tuntap
-#    - bridged-networking
-#    - iptables
+# playbook: Ansible playbook used for hosts configuration.
+# Check ansible/digitalocean.yml for the specific roles applied.
 #-------------------------------------------------------------------------------
 playbook:
   - digitalocean
@@ -67,8 +59,9 @@ defaults:
 #--------------------------------------------------------------------------------
 cluster:
   name: "${provision}"
-  description: 'digitalocean cluster'
-  datastores:
-    - 1
+  description: 'Digitalocean virtual edge cluster'
   reserved_cpu: '0'
   reserved_mem: '0'
+  datastores:
+    - 1
+    - 2
diff --git a/share/oneprovision/edge-clusters/virtual/provisions/google.d/inputs.yml b/share/oneprovision/edge-clusters/virtual/provisions/google.d/inputs.yml
index 3b3cb5d783..caf31c2af8 100644
--- a/share/oneprovision/edge-clusters/virtual/provisions/google.d/inputs.yml
+++ b/share/oneprovision/edge-clusters/virtual/provisions/google.d/inputs.yml
@@ -21,11 +21,6 @@ inputs:
     description: 'Number of Google instances to create'
     default: '1'
 
-  - name: 'number_public_ips'
-    type: text
-    description: 'Number of public IPs to get'
-    default: '1'
-
   - name: 'google_image'
     type: text
     description: "Google image used for host deployments"
@@ -39,6 +34,7 @@ inputs:
   - name: 'one_hypervisor'
     type: list
     description: "Virtualization technology for the cluster hosts"
+    default: 'lxc'
     options:
         - 'qemu'
         - 'lxc'
diff --git a/share/oneprovision/edge-clusters/virtual/provisions/google.yml b/share/oneprovision/edge-clusters/virtual/provisions/google.yml
index 3c4337d699..356c3035cd 100644
--- a/share/oneprovision/edge-clusters/virtual/provisions/google.yml
+++ b/share/oneprovision/edge-clusters/virtual/provisions/google.yml
@@ -33,7 +33,7 @@ extends:
 
 #-------------------------------------------------------------------------------
 # playbook: Ansible playbook used for hosts configuration.
-# Check ansible/googl.yml for the specific roles applied.
+# Check ansible/google.yml for the specific roles applied.
 #-------------------------------------------------------------------------------
 playbook:
   - google