diff --git a/TophatModules/Sources/AndroidDeviceKit/ProxyVirtualDevice.swift b/TophatModules/Sources/AndroidDeviceKit/ProxyVirtualDevice.swift
index 51f1260..80b49cb 100644
--- a/TophatModules/Sources/AndroidDeviceKit/ProxyVirtualDevice.swift
+++ b/TophatModules/Sources/AndroidDeviceKit/ProxyVirtualDevice.swift
@@ -50,8 +50,7 @@ extension ProxyVirtualDevice: Device {
 	}
 
 	var runtime: Runtime {
-		let parsedVersion = virtualDevice.androidVersion.replacingOccurrences(of: "Android ", with: "")
-		return .init(platform: .android, version: .exact(parsedVersion))
+		.init(platform: .android, version: .exact(virtualDevice.androidVersion))
 	}
 
 	var type: DeviceType {
diff --git a/TophatModules/Sources/AndroidDeviceKit/Utilities/AvdManager.swift b/TophatModules/Sources/AndroidDeviceKit/Utilities/AvdManager.swift
index 35a7810..9e7e894 100644
--- a/TophatModules/Sources/AndroidDeviceKit/Utilities/AvdManager.swift
+++ b/TophatModules/Sources/AndroidDeviceKit/Utilities/AvdManager.swift
@@ -40,9 +40,18 @@ private extension VirtualDevice {
 		"Target: "
 		characterOrSymbolCapture
 		anyWhitespace
-		"Based on: "
-		characterOrSymbolCapture
+		"Based on: Android "
+		Capture {
+			OneOrMore(CharacterClass.anyNonNewline, .reluctant)
+		}
 		anyWhitespace
+		Optionally {
+			"(\""
+			// Do not capture Android version codename.
+			OneOrMore(CharacterClass.anyNonNewline)
+			"\")"
+			anyWhitespace
+		}
 		"Tag/ABI: "
 		characterOrSymbolCapture
 		anyWhitespace