diff --git a/tasks/install.yml b/tasks/install.yml
index 9cc0a3dcf11f398da133cdd3c27b2c5a2d41b821..35b17eed25f69bca0eba5550cb216b516a779c5f 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -22,8 +22,10 @@
       drupalRoot='{{ webRoot }}{{ drupal.root|default("") }}'
       docRoot='{{ webRoot }}{{ drupal.docroot|default(drupal.root|default("")) }}'
       drushAlias='@{{ drushSubkey }}'
+      drushAliasValidate="'{{ drushAlias }}':"
   - set_fact:
       drushAlias='@{{ inventory_hostname }}{{ drushSubkey }}'
+      drushAliasValidate='{{ drushAlias }}'
     when: drush_version_main|default('8') == '8'
   tags: 'always'
 
@@ -268,7 +270,7 @@
     chdir: '{{ webRoot }}'
   register: drush_status
   changed_when: false
-  when: drushAlias in drush_aliases.stdout_lines
+  when: drushAliasValidate in drush_aliases.stdout_lines
   tags: 'deploy'
 
 - name: "Run Post Deploy Tasks"