--- a/contrib/automation/hgautomation/aws.py	Mon Jul 22 18:52:58 2019 -0700
+++ b/contrib/automation/hgautomation/aws.py	Mon Jul 22 18:55:52 2019 -0700
@@ -52,10 +52,14 @@
 }
 
 
+AMAZON_ACCOUNT_ID = '801119661308'
 DEBIAN_ACCOUNT_ID = '379101102735'
 UBUNTU_ACCOUNT_ID = '099720109477'
 
 
+WINDOWS_BASE_IMAGE_NAME = 'Windows_Server-2019-English-Full-Base-2019.07.12'
+
+
 KEY_PAIRS = {
     'automation',
 }
@@ -1046,9 +1050,7 @@
 
     name = '%s%s' % (prefix, 'windows-dev')
 
-    image = find_image(ec2resource,
-                       '801119661308',
-                       'Windows_Server-2019-English-Full-Base-2019.07.12')
+    image = find_image(ec2resource, AMAZON_ACCOUNT_ID, WINDOWS_BASE_IMAGE_NAME)
 
     config = {
         'BlockDeviceMappings': [