diff --git a/cloud/create_infra.yml b/cloud/create_infra.yml
index 0e199e6..1f48725 100644
--- a/cloud/create_infra.yml
+++ b/cloud/create_infra.yml
@@ -4,8 +4,7 @@
   gather_facts: no
   vars:
     infra_provider: undef
-    aws_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCK93BIfZx+MeEyP6qBha48FxtoZYsmx4grYOM3ZQMbkDp0v/cHFKHlUrZR67bVHuOriqrCScBaBfZ0RQk7mYpTAR5CgLed8Vun3LcQz7bZHq26CS83J8KE5Kbfhm07VzZfOND/yeuq3dU9P6Kb2HBufj+mUGgktUjuLVlRAk1KTYfTAevYcCfm75LtCKAkTsR5hG+yGHRo0n1lWeEhz8m0Gl1g0e3/eGo/bmViHvrKi5cGPu7K8p8JGhtXhpr0jMIqh5Ej7Iu2fPe/sV05Qp+am4upGPW7PmS2V82sMuZxLPeWZRJxvqstW7aSziUxbWu6b8gMfRJdzGa6b24ejp1R 2cfb-key
-
+    aws_public_key: undef
   tasks:
   - include_role:
       name: "demo.cloud.{{ infra_provider }}"
diff --git a/cloud/create_vm.yml b/cloud/create_vm.yml
index e03bf44..9eef8ad 100644
--- a/cloud/create_vm.yml
+++ b/cloud/create_vm.yml
@@ -15,7 +15,7 @@
 
   - name: "Check Provider Compatibility"
     assert:
-      that: "{{ vm_provider }} in {{ vm_blueprint_providers }}"
+      that: "'{{ vm_provider }}' in {{ vm_blueprint_providers }}"
       fail_msg: "{{ vm_blueprint | upper }} is not available for {{ vm_provider | upper }}"
     when: "vm_blueprint_providers is defined"
 
diff --git a/cloud/setup.yml b/cloud/setup.yml
index 48f6cab..e71b941 100644
--- a/cloud/setup.yml
+++ b/cloud/setup.yml
@@ -40,10 +40,15 @@ controller_templates:
       name: ''
       description: ''
       spec:
+        - question_name: Infra Provider
+          type: multiplechoice
+          variable: infra_provider
+          required: true
+          choices:
+            - aws
         - question_name: Public Key
           type: textarea
           variable: aws_public_key
-          required: true
   - name: Cloud / Create VM
     job_type: run
     organization: Default
@@ -79,4 +84,4 @@ controller_templates:
           type: multiplechoice
           variable: vm_blueprint
           required: true
-          choices: "{{ lookup('fileglob', 'blueprints/*.yml') | regex_replace(',','\n') | regex_findall('.*/(.*)(?=.yml)') }}"
\ No newline at end of file
+          choices: "{{ lookup('fileglob', 'blueprints/*.yml') | regex_replace(',','\n') | regex_findall('.*/(.*)(?=.yml)') | list }}"
\ No newline at end of file