diff --git a/yaml/compiler/clone.go b/yaml/compiler/clone.go
index 33386cf..3f4feed 100644
--- a/yaml/compiler/clone.go
+++ b/yaml/compiler/clone.go
@@ -33,8 +33,14 @@ func cloneImage(src *yaml.Pipeline) string {
 		return "drone/git:linux-arm"
 	case src.Platform.OS == "linux" && src.Platform.Arch == "arm64":
 		return "drone/git:linux-arm64"
+	case src.Platform.OS == "windows" && src.Platform.Version == "1809":
+		return "drone/git:windows-1809-amd64"
+	case src.Platform.OS == "windows" && src.Platform.Version == "1803":
+		return "drone/git:windows-1803" // TODO update to correct format
+	case src.Platform.OS == "windows" && src.Platform.Version == "1709":
+		return "drone/git:windows-1709-amd64"
 	case src.Platform.OS == "windows":
-		return "drone/git:windows-1803"
+		return "drone/git:windows-1809-amd64"
 	default:
 		return "drone/git"
 	}
diff --git a/yaml/compiler/clone_test.go b/yaml/compiler/clone_test.go
index cf76a33..8a2cff6 100644
--- a/yaml/compiler/clone_test.go
+++ b/yaml/compiler/clone_test.go
@@ -28,9 +28,17 @@ func TestCloneImage(t *testing.T) {
 			platform: yaml.Platform{OS: "linux", Arch: "arm64"},
 			image:    "drone/git:linux-arm64",
 		},
+		{
+			platform: yaml.Platform{OS: "windows", Arch: "amd64", Version: "1709"},
+			image:    "drone/git:windows-1709-amd64",
+		},
+		{
+			platform: yaml.Platform{OS: "windows", Arch: "amd64", Version: "1809"},
+			image:    "drone/git:windows-1809-amd64",
+		},
 		{
 			platform: yaml.Platform{OS: "windows", Arch: "amd64"},
-			image:    "drone/git:windows-1803",
+			image:    "drone/git:windows-1809-amd64",
 		},
 		{
 			platform: yaml.Platform{},