diff --git a/scenarios/aws/ec2/vmargs.go b/scenarios/aws/ec2/vmargs.go
index 054f8c215..db28a5816 100644
--- a/scenarios/aws/ec2/vmargs.go
+++ b/scenarios/aws/ec2/vmargs.go
@@ -37,10 +37,9 @@ func buildArgs(options ...VMOption) (*vmArgs, error) {
 }
 
 // WithOS sets the OS
-// Architecture defaults to os.AMD64Arch
 // Version defaults to latest
 func WithOS(osDesc os.Descriptor) VMOption {
-	return WithOSArch(osDesc, os.AMD64Arch)
+	return WithOSArch(osDesc, osDesc.Architecture)
 }
 
 // WithArch set the architecture and the operating system.
diff --git a/scenarios/azure/compute/vmargs.go b/scenarios/azure/compute/vmargs.go
index deab73a20..a05a2c80d 100644
--- a/scenarios/azure/compute/vmargs.go
+++ b/scenarios/azure/compute/vmargs.go
@@ -36,10 +36,9 @@ func buildArgs(options ...VMOption) (*vmArgs, error) {
 }
 
 // WithOS sets the OS
-// Architecture defaults to os.AMD64Arch
 // Version defaults to latest
 func WithOS(osDesc os.Descriptor) VMOption {
-	return WithOSArch(osDesc, os.AMD64Arch)
+	return WithOSArch(osDesc, osDesc.Architecture)
 }
 
 // WithArch set the architecture and the operating system.