diff --git a/roles/cloud-ec2/tasks/main.yml b/roles/cloud-ec2/tasks/main.yml
index 44eebc9..7d63217 100644
--- a/roles/cloud-ec2/tasks/main.yml
+++ b/roles/cloud-ec2/tasks/main.yml
@@ -6,13 +6,6 @@
   - name: Include prompts
     import_tasks: prompts.yml
 
-  - set_fact:
-      algo_region: >-
-        {% if region is defined %}{{ region }}
-        {%- elif _algo_region.user_input %}{{ aws_regions[_algo_region.user_input | int -1 ]['region_name'] }}
-        {%- else %}{{ aws_regions[default_region | int - 1]['region_name'] }}{% endif %}
-      stack_name: "{{ algo_server_name | replace('.', '-') }}"
-
   - name: Locate official AMI for region
     ec2_ami_facts:
       aws_access_key: "{{ access_key }}"
diff --git a/roles/cloud-ec2/tasks/prompts.yml b/roles/cloud-ec2/tasks/prompts.yml
index 040af83..db80584 100644
--- a/roles/cloud-ec2/tasks/prompts.yml
+++ b/roles/cloud-ec2/tasks/prompts.yml
@@ -54,9 +54,20 @@
     register: _algo_region
   when: region is undefined
 
+- name: Set algo_region and stack_name facts
+  set_fact:
+    algo_region: >-
+      {% if region is defined %}{{ region }}
+      {%- elif _algo_region.user_input %}{{ aws_regions[_algo_region.user_input | int -1 ]['region_name'] }}
+      {%- else %}{{ aws_regions[default_region | int - 1]['region_name'] }}{% endif %}
+    stack_name: "{{ algo_server_name | replace('.', '-') }}"
+
 - block:
   - name: Get existing available Elastic IPs
     ec2_eip_facts:
+      aws_access_key: "{{ access_key }}"
+      aws_secret_key: "{{ secret_key }}"
+      region: "{{ algo_region }}"
     register: raw_eip_addresses
 
   - set_fact: