diff --git a/pkg/container/docker_run.go b/pkg/container/docker_run.go
index dff2ac61..bf220e67 100644
--- a/pkg/container/docker_run.go
+++ b/pkg/container/docker_run.go
@@ -238,8 +238,10 @@ func RunnerArch(ctx context.Context) string {
 
 	archMapper := map[string]string{
 		"x86_64":  "X64",
+		"amd64":   "X64",
 		"386":     "X86",
 		"aarch64": "ARM64",
+		"arm64":   "ARM64",
 	}
 	if arch, ok := archMapper[info.Architecture]; ok {
 		return arch