diff --git a/roles/product_install/tasks/main.yml b/roles/product_install/tasks/main.yml
index b92c97f..83cfd05 100644
--- a/roles/product_install/tasks/main.yml
+++ b/roles/product_install/tasks/main.yml
@@ -81,6 +81,7 @@
         download_binary: true
         move_binary: false
         atl_product_download: "{{ atl_product_temp_download }}"
+        atl_product_normalized_version: "{{atl_product_version ~ '-z'|replace('-m', '-am')}}"
 
 
     - name: "Case: No cached version, or supplied is higher; use supplied"
@@ -88,8 +89,7 @@
         atl_download_version: "{{ atl_product_version }}"
       when: force_version_update | bool or
             not cached.stat.exists or
-            atl_product_version is version(atl_cached_version, '>')
-            {{atl_product_version ~ "-z"|replace("-m", "-am")}} is version({{atl_cached_version}}, '>')
+            atl_product_normalised_version is version(atl_cached_version, '>')
 
     - name: "Case: Cached version is higher or forced, ignore supplied"
       set_fact: