diff --git a/lib/msf/core/exploit/smb/client/psexec_ms17_010.rb b/lib/msf/core/exploit/smb/client/psexec_ms17_010.rb
index 950a4cb1e5..669b8bb20a 100644
--- a/lib/msf/core/exploit/smb/client/psexec_ms17_010.rb
+++ b/lib/msf/core/exploit/smb/client/psexec_ms17_010.rb
@@ -303,7 +303,7 @@ module Exploit::Remote::SMB::Client::Psexec_MS17_010
     if os.starts_with? 'Windows 10' or os.starts_with? 'Windows Server 2016' or os.starts_with? 'Windows 8' or os.starts_with? 'Windows Server 2012' or os.starts_with? 'Windows RT 9200'
       @ctx['os'] = 'WIN8'
       @ctx['go_fish'] = false
-    elsif os.starts_with? 'Windows 7 ' or os.starts_with? 'Windows Server 2008 R2'
+    elsif os.starts_with? 'Windows 7 ' or os.starts_with? 'Windows Server 2008 R2' or os.starts_wish? 'Windows Embedded Standard 7'
       @ctx['os'] = 'WIN7'
       @ctx['go_fish'] = false
     elsif os.starts_with? "Windows Server (R) 2008" or os.starts_with? 'Windows Vista'
diff --git a/modules/exploits/windows/smb/ms17_010_eternalblue.rb b/modules/exploits/windows/smb/ms17_010_eternalblue.rb
index 386fdc408d..af40974605 100644
--- a/modules/exploits/windows/smb/ms17_010_eternalblue.rb
+++ b/modules/exploits/windows/smb/ms17_010_eternalblue.rb
@@ -76,7 +76,7 @@ class MetasploitModule < Msf::Exploit::Remote
               'Platform'       => 'win',
               'Arch'           => [ ARCH_X64 ],
 
-              'os_patterns'    => ['Server 2008 R2', 'Windows 7'],
+              'os_patterns'    => ['Server 2008 R2', 'Windows 7', 'Windows Embedded Standard 7'],
               'ep_thl_b'       => 0x308,  # EPROCESS.ThreadListHead.Blink offset
               'et_alertable'   => 0x4c,   # ETHREAD.Alertable offset
               'teb_acp'        => 0x2c8,  # TEB.ActivationContextPointer offset