diff --git a/data/templates/cf/Windows.template b/data/templates/cf/Windows.template
index 6c16d82..f562de3 100644
--- a/data/templates/cf/Windows.template
+++ b/data/templates/cf/Windows.template
@@ -15,7 +15,12 @@
     "ImageName" : {
       "Description" : "Image name",
       "Type" : "String"
-    }   
+    },
+    "AvailabilityZone" : {
+      "Description" : "The Availability Zone in which to launch the instance.",
+      "Type" : "String",
+      "Default" : "nova"
+    }
   },
  
   "Resources" : {
@@ -24,6 +29,7 @@
       "Properties": {
         "InstanceType" : { "Ref" : "InstanceType" },
         "ImageId" : { "Ref" : "ImageName" },
+        "AvailabilityZone" : { "Ref" : "AvailabilityZone" },
         "UserData": "$userData"
       }
     }
diff --git a/data/workflows/AD.xml b/data/workflows/AD.xml
index 696c0f4..8a3befb 100644
--- a/data/workflows/AD.xml
+++ b/data/workflows/AD.xml
@@ -5,7 +5,7 @@
 		</set>
 	</rule>
 
-	<rule match="$.services[?(@.type == 'activeDirectory')].units[?(@.state.hostname and not @.state.instanceName)]">
+	<rule match="$.services[?(@.type == 'activeDirectory')].units[?(@.state.hostname and @.state.osImageName and not @.state.instanceName)]">
 		<report entity="unit">
 			<parameter name="id"><select path="id"/></parameter>
 			<parameter name="text">Creating instance <select path="state.hostname"/> (<select path="name"/>)</parameter>
@@ -26,7 +26,8 @@
 			<parameter name="arguments">
 				<map>
 					<argument name="InstanceType"><select path="::flavor" default="m1.medium"/></argument>
-					<argument name="ImageName">ws-2012-full</argument>
+					<argument name="ImageName"><select path="state.osImageName"/></argument>
+					<argument name="AvailabilityZone"><select path="::availabilityZone" default="nova"/></argument>
 				</map>
 			</parameter>
 
diff --git a/data/workflows/AspNetApps.xml b/data/workflows/AspNetApps.xml
index f151bfe..e40efe2 100644
--- a/data/workflows/AspNetApps.xml
+++ b/data/workflows/AspNetApps.xml
@@ -5,7 +5,7 @@
 		</set>
 	</rule>
 
-	<rule match="$.services[?(@.type in ('webServer', 'aspNetApp', 'webServerFarm', 'aspNetAppFarm'))].units[?(@.state.hostname and not @.state.instanceName)]">
+	<rule match="$.services[?(@.type in ('webServer', 'aspNetApp', 'webServerFarm', 'aspNetAppFarm'))].units[?(@.state.hostname and @.state.osImageName and not @.state.instanceName)]">
 		<report entity="unit">
 			<parameter name="id"><select path="id"/></parameter>
 			<parameter name="text">Creating instance <select path="state.hostname"/> (<select path="name"/>)</parameter>
@@ -26,7 +26,8 @@
 			<parameter name="arguments">
 				<map>
 					<argument name="InstanceType"><select path="::flavor" default="m1.medium"/></argument>
-					<argument name="ImageName">ws-2012-full</argument>
+					<argument name="ImageName"><select path="state.osImageName"/></argument>
+					<argument name="AvailabilityZone"><select path="::availabilityZone" default="nova"/></argument>
 				</map>
 			</parameter>
 
diff --git a/data/workflows/ExternalAD.xml.example b/data/workflows/ExternalAD.xml.example
index de92b83..aba1a1b 100644
--- a/data/workflows/ExternalAD.xml.example
+++ b/data/workflows/ExternalAD.xml.example
@@ -8,7 +8,7 @@
  <!--  Specify here parameters of domain controllers at each availability zone -->
  <!--  ======================================================================= -->
 
-        <mapping name="Region1">
+        <mapping name="nova">
             <map>
                 <mapping name="domain">domain1</mapping>
                 <mapping name="domainUser">Administrator</mapping>
@@ -18,7 +18,7 @@
             </map>
         </mapping>
 
-        <mapping name="Region2">
+        <mapping name="AnotherAvailabilityZone">
             <map>
                 <mapping name="domain">domain2</mapping>
                 <mapping name="domainUser">Administrator</mapping>
diff --git a/data/workflows/Images.xml b/data/workflows/Images.xml
new file mode 100644
index 0000000..57fed7f
--- /dev/null
+++ b/data/workflows/Images.xml
@@ -0,0 +1,26 @@
+<workflow>
+	<rule match="$.services[*].units[?(not @.state.osImageName)]">
+        <set path="#osImageMap">
+            <map>
+
+ <!--  ====================================================================== -->
+ <!--  Mappings between image IDs and image file names can be configured here -->
+ <!--  ====================================================================== -->
+
+            <mapping name="win2k12full">ws-2012-full</mapping>
+
+            <!-- image to use if no image id provided -->
+            <mapping name="DEFAULT">ws-2012-full</mapping>
+
+ <!--  ====================================================================== -->
+
+            </map>
+        </set>
+		<set path="state.osImageName">
+			<select source="osImageMap">
+                <parameter name="path"><select path="::osImage" default="DEFAULT"/></parameter>
+			</select>
+		</set>
+    </rule>
+
+ </workflow>
\ No newline at end of file
diff --git a/data/workflows/MsSqlServer.xml b/data/workflows/MsSqlServer.xml
index 01a53bd..f4f7eb2 100644
--- a/data/workflows/MsSqlServer.xml
+++ b/data/workflows/MsSqlServer.xml
@@ -5,7 +5,7 @@
 		</set>
 	</rule>
 
-	<rule match="$.services[?(@.type == 'msSqlServer')].units[?(@.state.hostname and not @.state.instanceName)]">
+	<rule match="$.services[?(@.type == 'msSqlServer')].units[?(@.state.hostname and @.state.osImageName and not @.state.instanceName)]">
 		<report entity="unit">
 			<parameter name="id"><select path="id"/></parameter>
 			<parameter name="text">Creating instance <select path="state.hostname"/> (<select path="name"/>)</parameter>
@@ -26,7 +26,8 @@
 			<parameter name="arguments">
 				<map>
 					<argument name="InstanceType"><select path="::flavor" default="m1.medium"/></argument>
-					<argument name="ImageName">ws-2012-full</argument>
+					<argument name="ImageName"><select path="state.osImageName"/></argument>
+					<argument name="AvailabilityZone"><select path="::availabilityZone" default="nova"/></argument>
 				</map>
 			</parameter>