diff --git a/cookbooks/arcgis-enterprise/libraries/datastore_tools.rb b/cookbooks/arcgis-enterprise/libraries/datastore_tools.rb
index f61d405..f6c831f 100644
--- a/cookbooks/arcgis-enterprise/libraries/datastore_tools.rb
+++ b/cookbooks/arcgis-enterprise/libraries/datastore_tools.rb
@@ -87,7 +87,7 @@ def configure_datastore(stores, server_url, username, password, data_dir, mode =
       # Add --mode parameter for post 10.8.1 tilecache and object data stores 
       # if the last known status is not 'Upgrading'.
       if !mode.nil? && !mode.empty? &&
-         Gem::Version.new(@version) >= Gem::Version.new('10.8.1') &&
+         Gem::Version.new(@version.gsub(/\s+/, '-')) >= Gem::Version.new('10.8.1') &&
          stores.downcase.include?('tilecache') &&
          last_known_status(data_dir) != 'Upgrading'
         args += " --mode #{mode}"
diff --git a/cookbooks/arcgis-enterprise/providers/datastore.rb b/cookbooks/arcgis-enterprise/providers/datastore.rb
index bc651e4..8c520b1 100644
--- a/cookbooks/arcgis-enterprise/providers/datastore.rb
+++ b/cookbooks/arcgis-enterprise/providers/datastore.rb
@@ -404,7 +404,7 @@
 
   # At 10.8 tilecache backup location is no longer registered by default
   # therefore --operation register needs to be used.
-  if %w[tilecache spatiotemporal graph].include?(@new_resource.store) && Gem::Version.new(node['arcgis']['version']) >= Gem::Version.new('10.8')
+  if %w[tilecache spatiotemporal graph].include?(@new_resource.store) && Gem::Version.new(node['arcgis']['version'].gsub(/\s+/, '-')) >= Gem::Version.new('10.8')
     operation = 'register'
   end