diff --git a/share/oneprovision/hybrid+/providers/aws/aws-eu-central-1.yml b/share/oneprovision/hybrid+/providers/aws/aws-eu-central-1.yml
index 00b30bdaa6..a300df4959 100644
--- a/share/oneprovision/hybrid+/providers/aws/aws-eu-central-1.yml
+++ b/share/oneprovision/hybrid+/providers/aws/aws-eu-central-1.yml
@@ -7,6 +7,7 @@ description: 'Elastic cluster on AWS in Frakfurt'
 plain:
   image: 'AWS.webp'
 
+location_key: 'region'
 connection:
   access_key: 'Encrypted AWS access key'
   secret_key: 'Encrypted AWS secret key'
diff --git a/share/oneprovision/hybrid+/providers/aws/aws-us-east-1.yml b/share/oneprovision/hybrid+/providers/aws/aws-us-east-1.yml
index 6829500d3c..e6d5e5e3ce 100644
--- a/share/oneprovision/hybrid+/providers/aws/aws-us-east-1.yml
+++ b/share/oneprovision/hybrid+/providers/aws/aws-us-east-1.yml
@@ -7,15 +7,20 @@ description: 'Elastic cluster on AWS in North Virginia'
 plain:
   image: 'AWS.webp'
 
+location_key: 'region'
 connection:
   access_key: 'Encrypted AWS access key'
   secret_key: 'Encrypted AWS secret key'
   region: 'us-east-1'
 
 inputs:
-   aws_ami_image:
-     - 'ami-096fda3c22c1c990a'
-     - 'ami-00ddb0e5626798373'
-   aws_instance_type:
-     - 'i3-metal'
-     - 'i3.large'
+   - name: 'aws_ami_image'
+     type: 'list'
+     options:
+       - 'ami-096fda3c22c1c990a'
+       - 'ami-00ddb0e5626798373'
+   - name: 'aws_instance_type'
+     type: 'list'
+     options:
+       - 'i3-metal'
+       - 'i3.large'
\ No newline at end of file
diff --git a/share/oneprovision/hybrid+/providers/packet/packet-amsterdam.yml b/share/oneprovision/hybrid+/providers/packet/packet-amsterdam.yml
index 0d8355db84..60188d399e 100644
--- a/share/oneprovision/hybrid+/providers/packet/packet-amsterdam.yml
+++ b/share/oneprovision/hybrid+/providers/packet/packet-amsterdam.yml
@@ -7,6 +7,7 @@ description: 'Elastic cluster on Packet in Amsterdam'
 plain:
   image: 'Packet.webp'
 
+location_key: 'facility'
 connection:
   token: 'Encrypted Packet token'
   project: 'Encrypted Packet project'