diff --git a/modules/preprocessing.py b/modules/preprocessing.py
index 8726db25533fe56ddf9e85b9528cbed47dbbd001..b331775d219b38ee60437f919d808a6734aa6b3f 100644
--- a/modules/preprocessing.py
+++ b/modules/preprocessing.py
@@ -84,7 +84,7 @@ def _find_windows_boxes(definitions):
 def _add_windows_attributes(host):
     """Add vagrant attributes to windows hosts"""
     host["communicator"] = "winrm"
-    host["winrm_username"] = "vagrant"
+    host["winrm_username"] = "windows"
     host["winrm_password"] = "vagrant"
 
 
diff --git a/modules/vagrant_generator.py b/modules/vagrant_generator.py
index 2570b081b32a72bbc6e18e7ddd9d2b2a21bf9c37..82f8ee1c6ccffbc53d74ec3eb2e7ab69e8b11c6b 100644
--- a/modules/vagrant_generator.py
+++ b/modules/vagrant_generator.py
@@ -162,7 +162,7 @@ def _create_ansible_commands(device_name, playbook_location, input_definitions,
     extravars["dictionary"] = dict()
     if device_name in windows_hosts:
         extravars["dictionary"]["ansible_connection"] = "\"winrm\""
-        extravars["dictionary"]["ansible_user"] = "\"vagrant\""
+        extravars["dictionary"]["ansible_user"] = "\"windows\""
         extravars["dictionary"]["ansible_password"] = "\"vagrant\""
         extravars["dictionary"]["ansible_winrm_transport"] = "\"basic\""
         extravars["dictionary"]["ansible_winrm_server_cert_validation"] = "\"ignore\""
diff --git a/templates/device_configuration b/templates/device_configuration
index 1e103ef7a98d0effefb1508d17fa7c968d082d04..39582f43fcbd55f9b3bb3ea88fda7bebcbdd2612 100644
--- a/templates/device_configuration
+++ b/templates/device_configuration
@@ -31,7 +31,7 @@
   hosts: windows
   become: yes
   become_method: runas
-  become_user: vagrant
+  become_user: windows
   vars:
     ansible_become_pass: vagrant
   tasks: