diff --git a/share/oneprovision/provisions/hybrid+/providers/aws/aws-eu-central-1.yml b/share/oneprovision/provisions/hybrid+/providers/aws/aws-eu-central-1.yml
index 54812494e3..5c3850d61b 100644
--- a/share/oneprovision/provisions/hybrid+/providers/aws/aws-eu-central-1.yml
+++ b/share/oneprovision/provisions/hybrid+/providers/aws/aws-eu-central-1.yml
@@ -9,17 +9,16 @@ plain:
 
 location_key: 'region'
 connection:
-  access_key: 'Encrypted AWS access key'
-  secret_key: 'Encrypted AWS secret key'
+  access_key: 'AWS access key'
+  secret_key: 'AWS secret key'
   region: 'eu-central-1'
 
 inputs:
    - name: 'aws_ami_image'
      type: 'list'
      options:
-       - 'ami-0e342d72b12109f91'
-       - 'ami-0b793c1e0d1dc4d28'
+       - 'ami-04c21037b3f953d37'
    - name: 'aws_instance_type'
      type: 'list'
      options:
-       - 'i3-metal'
+       - 'i3.metal'
diff --git a/share/oneprovision/provisions/hybrid+/providers/aws/aws-eu-west-2.yml b/share/oneprovision/provisions/hybrid+/providers/aws/aws-eu-west-2.yml
new file mode 100644
index 0000000000..77cb4ab708
--- /dev/null
+++ b/share/oneprovision/provisions/hybrid+/providers/aws/aws-eu-west-2.yml
@@ -0,0 +1,24 @@
+name: 'aws-london'
+
+description: 'Elastic cluster on AWS in London'
+provider: 'aws'
+
+plain:
+  provision_type: 'hybrid+_qemu'
+  image: 'AWS.webp'
+
+location_key: 'region'
+connection:
+  access_key: 'AWS access key'
+  secret_key: 'AWS secret key'
+  region: 'eu-west-2'
+
+inputs:
+   - name: 'aws_ami_image'
+     type: 'list'
+     options:
+       - 'ami-0bab5c8be0975423b'
+   - name: 'aws_instance_type'
+     type: 'list'
+     options:
+       - 'i3.metal'
diff --git a/share/oneprovision/provisions/hybrid+/providers/aws/aws-us-east-1.yml b/share/oneprovision/provisions/hybrid+/providers/aws/aws-us-east-1.yml
index afc3d9fe99..6407edd5ea 100644
--- a/share/oneprovision/provisions/hybrid+/providers/aws/aws-us-east-1.yml
+++ b/share/oneprovision/provisions/hybrid+/providers/aws/aws-us-east-1.yml
@@ -9,18 +9,16 @@ plain:
 
 location_key: 'region'
 connection:
-  access_key: 'Encrypted AWS access key'
-  secret_key: 'Encrypted AWS secret key'
+  access_key: 'AWS access key'
+  secret_key: 'AWS secret key'
   region: 'us-east-1'
 
 inputs:
    - name: 'aws_ami_image'
      type: 'list'
      options:
-       - 'ami-096fda3c22c1c990a'
-       - 'ami-00ddb0e5626798373'
+       - 'ami-0d6e9a57f6259ba3a'
    - name: 'aws_instance_type'
      type: 'list'
      options:
-       - 'i3-metal'
-       - 'i3.large'
+       - 'i3.metal'
diff --git a/share/oneprovision/provisions/hybrid+/providers/aws/aws-us-west-1.yml b/share/oneprovision/provisions/hybrid+/providers/aws/aws-us-west-1.yml
new file mode 100644
index 0000000000..c2283da77d
--- /dev/null
+++ b/share/oneprovision/provisions/hybrid+/providers/aws/aws-us-west-1.yml
@@ -0,0 +1,24 @@
+name: 'aws-north-california'
+
+description: 'Elastic cluster on AWS in North California'
+provider: 'aws'
+
+plain:
+  provision_type: 'hybrid+'
+  image: 'AWS.webp'
+
+location_key: 'region'
+connection:
+  access_key: 'AWS access key'
+  secret_key: 'AWS secret key'
+  region: 'us-west-1'
+
+inputs:
+   - name: 'aws_ami_image'
+     type: 'list'
+     options:
+       - 'ami-08b547f0dcb46c4d3'
+   - name: 'aws_instance_type'
+     type: 'list'
+     options:
+       - 'i3.metal'
diff --git a/share/oneprovision/provisions/hybrid+/providers/packet/packet-amsterdam.yml b/share/oneprovision/provisions/hybrid+/providers/packet/packet-ams1.yml
similarity index 75%
rename from share/oneprovision/provisions/hybrid+/providers/packet/packet-amsterdam.yml
rename to share/oneprovision/provisions/hybrid+/providers/packet/packet-ams1.yml
index b2c69a2c56..5aa2932599 100644
--- a/share/oneprovision/provisions/hybrid+/providers/packet/packet-amsterdam.yml
+++ b/share/oneprovision/provisions/hybrid+/providers/packet/packet-ams1.yml
@@ -9,16 +9,15 @@ plain:
 
 location_key: 'facility'
 connection:
-  token: 'Encrypted Packet token'
-  project: 'Encrypted Packet project'
+  token: 'Packet token'
+  project: 'Packet project'
   facility: 'ams1'
 
 inputs:
    - name: 'packet_os'
      type: 'list'
      options:
-       - 'centos_7'
-       - 'ubuntu_18_04'
+       - 'centos_8'
    - name: 'packet_plan'
      type: 'list'
      options:
diff --git a/share/oneprovision/provisions/hybrid+/providers/packet/packet-ewr1.yml b/share/oneprovision/provisions/hybrid+/providers/packet/packet-ewr1.yml
new file mode 100644
index 0000000000..fa1135da6b
--- /dev/null
+++ b/share/oneprovision/provisions/hybrid+/providers/packet/packet-ewr1.yml
@@ -0,0 +1,26 @@
+name: 'packet-ewr1'
+
+description: 'Elastic cluster on Packet in Parsippany, USA, NJ'
+provider: 'packet'
+
+plain:
+  provision_type: 'hybrid+'
+  image: 'EQUINIX.webp'
+
+location_key: 'facility'
+connection:
+  token: 'Packet token'
+  project: 'Packet project'
+  facility: 'ewr1'
+
+inputs:
+   - name: 'packet_os'
+     type: 'list'
+     options:
+       - 'centos_8'
+   - name: 'packet_plan'
+     type: 'list'
+     options:
+       - 't1.small'
+       - 'c1.small'
+       - 'm1.xlarge'
diff --git a/share/oneprovision/provisions/hybrid+/providers/packet/packet-nrt1.yml b/share/oneprovision/provisions/hybrid+/providers/packet/packet-nrt1.yml
new file mode 100644
index 0000000000..c4c5388988
--- /dev/null
+++ b/share/oneprovision/provisions/hybrid+/providers/packet/packet-nrt1.yml
@@ -0,0 +1,26 @@
+name: 'packet-nrt1'
+
+description: 'Elastic cluster on Packet in Tokyo, Japan'
+provider: 'packet'
+
+plain:
+  provision_type: 'hybrid+'
+  image: 'EQUINIX.webp'
+
+location_key: 'facility'
+connection:
+  token: 'Packet token'
+  project: 'Packet project'
+  facility: 'nrt1'
+
+inputs:
+   - name: 'packet_os'
+     type: 'list'
+     options:
+       - 'centos_8'
+   - name: 'packet_plan'
+     type: 'list'
+     options:
+       - 't1.small'
+       - 'c1.small'
+       - 'm1.xlarge'
diff --git a/share/oneprovision/provisions/hybrid+/providers/packet/packet-sjc1.yml b/share/oneprovision/provisions/hybrid+/providers/packet/packet-sjc1.yml
new file mode 100644
index 0000000000..09937442f1
--- /dev/null
+++ b/share/oneprovision/provisions/hybrid+/providers/packet/packet-sjc1.yml
@@ -0,0 +1,26 @@
+name: 'packet-sjc1'
+
+description: 'Elastic cluster on Packet in Sunnyvale, USA, CA'
+provider: 'packet'
+
+plain:
+  provision_type: 'hybrid+'
+  image: 'EQUINIX.webp'
+
+location_key: 'facility'
+connection:
+  token: 'Packet token'
+  project: 'Packet project'
+  facility: 'sjc1'
+
+inputs:
+   - name: 'packet_os'
+     type: 'list'
+     options:
+       - 'centos_8'
+   - name: 'packet_plan'
+     type: 'list'
+     options:
+       - 't1.small'
+       - 'c1.small'
+       - 'm1.xlarge'
diff --git a/share/oneprovision/provisions/hybrid+/provisions/aws.yml b/share/oneprovision/provisions/hybrid+/provisions/aws.yml
index e4e48c5e13..0daaf331a9 100644
--- a/share/oneprovision/provisions/hybrid+/provisions/aws.yml
+++ b/share/oneprovision/provisions/hybrid+/provisions/aws.yml
@@ -58,6 +58,8 @@ defaults:
     ami: "${input.aws_ami_image}"
     instancetype: "${input.aws_instance_type}"
     cloud_init: true
+  connection:
+    remote_user: 'centos'
 
 #-------------------------------------------------------------------------------
 # cluster: Parameters for the OpenNebula cluster. Applies to all the Hosts
diff --git a/share/oneprovision/provisions/hybrid+_qemu/providers/aws/aws-eu-central-1.yml b/share/oneprovision/provisions/hybrid+_qemu/providers/aws/aws-eu-central-1.yml
new file mode 100644
index 0000000000..46e3946585
--- /dev/null
+++ b/share/oneprovision/provisions/hybrid+_qemu/providers/aws/aws-eu-central-1.yml
@@ -0,0 +1,26 @@
+name: 'aws-frankfurt'
+
+description: 'Elastic cluster on AWS in Frankfurt'
+provider: 'aws'
+
+plain:
+  provision_type: 'hybrid+_qemu'
+  image: 'AWS.webp'
+
+location_key: 'region'
+connection:
+  access_key: 'AWS access key'
+  secret_key: 'AWS secret key'
+  region: 'eu-central-1'
+
+inputs:
+   - name: 'aws_ami_image'
+     type: 'list'
+     options:
+       - 'ami-04c21037b3f953d37'
+   - name: 'aws_instance_type'
+     type: 'list'
+     options:
+       - 't2.micro'
+       - 't2.small'
+       - 't2.medium'
diff --git a/share/oneprovision/provisions/hybrid+_qemu/providers/aws/aws-eu-west-2.yml b/share/oneprovision/provisions/hybrid+_qemu/providers/aws/aws-eu-west-2.yml
index 7bac74d4c8..28b030eca6 100644
--- a/share/oneprovision/provisions/hybrid+_qemu/providers/aws/aws-eu-west-2.yml
+++ b/share/oneprovision/provisions/hybrid+_qemu/providers/aws/aws-eu-west-2.yml
@@ -9,8 +9,8 @@ plain:
 
 location_key: 'region'
 connection:
-  access_key: 'Encrypted AWS access key'
-  secret_key: 'Encrypted AWS secret key'
+  access_key: 'AWS access key'
+  secret_key: 'AWS secret key'
   region: 'eu-west-2'
 
 inputs:
diff --git a/share/oneprovision/provisions/hybrid+_qemu/providers/aws/aws-us-east-1.yml b/share/oneprovision/provisions/hybrid+_qemu/providers/aws/aws-us-east-1.yml
new file mode 100644
index 0000000000..1f54061062
--- /dev/null
+++ b/share/oneprovision/provisions/hybrid+_qemu/providers/aws/aws-us-east-1.yml
@@ -0,0 +1,26 @@
+name: 'aws-north-virginia'
+
+description: 'Elastic cluster on AWS in North Virginia'
+provider: 'aws'
+
+plain:
+  provision_type: 'hybrid+_qemu'
+  image: 'AWS.webp'
+
+location_key: 'region'
+connection:
+  access_key: 'AWS access key'
+  secret_key: 'AWS secret key'
+  region: 'us-east-1'
+
+inputs:
+   - name: 'aws_ami_image'
+     type: 'list'
+     options:
+       - 'ami-0d6e9a57f6259ba3a'
+   - name: 'aws_instance_type'
+     type: 'list'
+     options:
+       - 't2.micro'
+       - 't2.small'
+       - 't2.medium'
diff --git a/share/oneprovision/provisions/hybrid+_qemu/providers/aws/aws-us-west-1.yml b/share/oneprovision/provisions/hybrid+_qemu/providers/aws/aws-us-west-1.yml
new file mode 100644
index 0000000000..0b041f3a0e
--- /dev/null
+++ b/share/oneprovision/provisions/hybrid+_qemu/providers/aws/aws-us-west-1.yml
@@ -0,0 +1,26 @@
+name: 'aws-north-california'
+
+description: 'Elastic cluster on AWS in North California'
+provider: 'aws'
+
+plain:
+  provision_type: 'hybrid+_qemu'
+  image: 'AWS.webp'
+
+location_key: 'region'
+connection:
+  access_key: 'AWS access key'
+  secret_key: 'AWS secret key'
+  region: 'us-west-1'
+
+inputs:
+   - name: 'aws_ami_image'
+     type: 'list'
+     options:
+       - 'ami-08b547f0dcb46c4d3'
+   - name: 'aws_instance_type'
+     type: 'list'
+     options:
+       - 't2.micro'
+       - 't2.small'
+       - 't2.medium'