diff --git a/roles/product_install/defaults/main.yml b/roles/product_install/defaults/main.yml
index a12666e..b9f7dbd 100644
--- a/roles/product_install/defaults/main.yml
+++ b/roles/product_install/defaults/main.yml
@@ -37,7 +37,8 @@ atl_servicedesk_url_map:
 atl_servicedesk_metadata_url: "{{ atl_servicedesk_url_map[atl_product_version] | default(atl_servicedesk_url_map['default']) }}"
 
 atl_install_jsd_as_obr: false
-atl_marketplace_obr: true
+atl_source_obr_from_marketplace: true
+atl_source_obr_from_url: false
 atl_servicedesk_download_file: "{{ atl_installer_temp }}/jira-servicedesk.{{ atl_product_version }}.obr"
 
 force_version_update: false
diff --git a/roles/product_install/tasks/jira-servicedesk_as_obr.yml b/roles/product_install/tasks/jira-servicedesk_as_obr.yml
index 3e10f3f..40600f1 100644
--- a/roles/product_install/tasks/jira-servicedesk_as_obr.yml
+++ b/roles/product_install/tasks/jira-servicedesk_as_obr.yml
@@ -1,49 +1,50 @@
 ---
 
-# - name: Source jira-servicedesk obr from marketplace
-#   block:
-
 - name: Check for alternate obr download url
   set_fact:
-    atl_marketplace_obr: false
+    atl_source_obr_from_marketplace: false
+    atl_source_obr_from_url: true
   when:
     - atl_obr_download_url is defined
 
-- name: Get the installer product version info
-  uri:
-    url: "{{ atl_mpac_products }}/key/jira/versions/name/{{ atl_product_version }}"
-    return_content: yes
-  register: atl_product_version_info
+- name: Source jira-servicedesk obr from marketplace
+  block:
 
-- name: Show the returned build number
-  debug:
-    msg="buildNumber={{ atl_product_version_info.json.buildNumber }}"
+    - name: Get the installer product version info
+      uri:
+        url: "{{ atl_mpac_products }}/key/jira/versions/name/{{ atl_product_version }}"
+        return_content: yes
+      register: atl_product_version_info
 
-- name: Get the JSD build version info
-  uri:
-    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
+    - name: Show the returned build number
+      debug:
+        msg="buildNumber={{ atl_product_version_info.json.buildNumber }}"
 
-- name: Show the returned obr binary href
-  debug:
-    msg="obr_ref={{ atl_jsd_build_info.json._embedded.artifact._links.binary.href }}"
+    - name: Get the JSD build version info
+      uri:
+        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
 
-- name: Set atl_obr_download_url
-  set_fact:
-    atl_obr_download_url: "{{ atl_jsd_build_info.json._embedded.artifact._links.binary.href }}"
+    - name: Show the returned obr binary href
+      debug:
+        msg="obr_ref={{ atl_jsd_build_info.json._embedded.artifact._links.binary.href }}"
 
-- name: Show the obr filename
-  debug:
-    msg="obr_name=jira-servicedesk-application-{{ atl_jsd_build_info.json.name }}.obr"
+    - name: Set atl_obr_download_url
+      set_fact:
+        atl_obr_download_url: "{{ atl_jsd_build_info.json._embedded.artifact._links.binary.href }}"
 
-- name: Set the obr filename
-  set_fact:
-    atl_obr_filename: "jira-servicedesk-application-{{ atl_jsd_build_info.json.name }}.obr"
+    - name: Show the obr filename
+      debug:
+        msg="obr_name=jira-servicedesk-application-{{ atl_jsd_build_info.json.name }}.obr"
 
-  # when:
-  #   - atl_obr_download_url is undefined
+    - name: Set the obr filename
+      set_fact:
+        atl_obr_filename: "jira-servicedesk-application-{{ atl_jsd_build_info.json.name }}.obr"
+
+  when:
+    - atl_source_obr_from_marketplace
 
 - name: is shared_home set ?
   debug: