diff --git a/roles/product_install/defaults/main.yml b/roles/product_install/defaults/main.yml
index 211e76e..4b62635 100644
--- a/roles/product_install/defaults/main.yml
+++ b/roles/product_install/defaults/main.yml
@@ -23,6 +23,7 @@ atl_product_download: "{{ atl_installer_temp }}/{{ atl_product_download_filename
 atl_product_varfile: "{{ atl_installer_temp }}/{{ atl_product_family }}.varfile"
 
 atl_marketplace_base: "https://marketplace.atlassian.com"
+atl_mpac_products: "https://marketplace.atlassian.com/rest/2/products"
 atl_servicedesk_latest_url: "https://marketplace.atlassian.com/rest/2/products/key/jira-servicedesk/versions/latest"
 atl_servicedesk_versioned_url: "https://marketplace.atlassian.com/rest/2/products/key/jira-servicedesk/versions/name/{{ atl_product_version }}"
 atl_servicedesk_url_map:
diff --git a/roles/product_install/tasks/jira-servicedesk_as_obr.yml b/roles/product_install/tasks/jira-servicedesk_as_obr.yml
index b8c0369..ca013e6 100644
--- a/roles/product_install/tasks/jira-servicedesk_as_obr.yml
+++ b/roles/product_install/tasks/jira-servicedesk_as_obr.yml
@@ -2,7 +2,7 @@
 
 - name: Get the installer product version info
   uri:
-    url: "https://marketplace.atlassian.com/rest/2/products/key/jira-software/versions/name/{{ atl_product_version }}"
+    url: "{{ atl_mpac_products }}/key/jira-software/versions/name/{{ atl_product_version }}"
     return_content: yes
   register: atl_product_version_info
 
@@ -12,7 +12,7 @@
 
 - name: Get the JSD build version info
   uri:
-    url: "https://marketplace.atlassian.com/rest/2/products/key/jira-servicedesk/versions/latest?application=\
+    url: "{{ atl_mpac_products }}/key/jira-servicedesk/versions/latest?application=\
     jira&applicationBuild={{ atl_product_version_info.json.buildNumber }}"
     return_content: yes
   register: atl_jsd_build_info
@@ -53,9 +53,6 @@
     owner: "{{ atl_product_user }}"
     group: "{{ atl_product_user }}"
     mode: 0750
-    # Ansible unarchive task validation does not work with the -j flag so we need to achieve the same result in 2 steps
-    # extra_opts:
-    #   - "-j"
 
 - name: Copy JSD dependency jars into the installed-plugins dir
   copy: