diff --git a/roles/product_install/tasks/main.yml b/roles/product_install/tasks/main.yml
index 5d61cad..eece7e2 100644
--- a/roles/product_install/tasks/main.yml
+++ b/roles/product_install/tasks/main.yml
@@ -183,14 +183,11 @@
       ansible.builtin.get_url:
         url: "{{ atl_product_download_url }}"
         dest: "{{ atl_product_temp_download }}"
-        url_password: "{{ lookup('amazon.aws.aws_secret', passwordpath, region=ansible_ec2_placement_region, bypath=false, nested=true, on_denied='skip', on_missing='skip') | default(omit) }}"
-        url_username: "{{ lookup('amazon.aws.aws_secret', userpath, region=ansible_ec2_placement_region, bypath=false, nested=true, on_denied='skip', on_missing='skip') | default(omit) }}"
+        url_password: "{{ lookup('amazon.aws.aws_secret', 'download_atlassian.password', region=ansible_ec2_placement_region, bypath=false, nested=true, on_denied='skip', on_missing='skip') | default(omit) }}"
+        url_username: "{{ lookup('amazon.aws.aws_secret', 'download_atlassian.username', region=ansible_ec2_placement_region, bypath=false, nested=true, on_denied='skip', on_missing='skip') | default(omit) }}"
         mode: 0755
         force: false
       register: atl_product_completed
-      vars:
-        passwordpath: "download_atlassian.password"
-        userpath: "download_atlassian.username"
 
     # If product installer was fetched make the lock directory
     - name: Create moving_lock.