diff --git a/pkg/cmd/roachtest/tests/restore.go b/pkg/cmd/roachtest/tests/restore.go
index 9d76abed92b1..f569183bafac 100644
--- a/pkg/cmd/roachtest/tests/restore.go
+++ b/pkg/cmd/roachtest/tests/restore.go
@@ -312,7 +312,7 @@ func registerRestore(r registry.Registry) {
 		},
 		{
 			// The nightly 8TB Restore test.
-			hardware: makeHardwareSpecs(hardwareSpecs{nodes: 10, volumeSize: 2000}),
+			hardware: makeHardwareSpecs(hardwareSpecs{cpus: 8, nodes: 10, volumeSize: 2000}),
 			backup: makeBackupSpecs(backupSpecs{
 				version:  "v22.2.1",
 				workload: tpceRestore{customers: 500000}}),
@@ -411,7 +411,17 @@ func (hw hardwareSpecs) makeClusterSpecs(r registry.Registry) spec.ClusterSpec {
 	if hw.mem != spec.Auto {
 		clusterOpts = append(clusterOpts, spec.Mem(hw.mem))
 	}
-	return r.MakeClusterSpec(hw.nodes, clusterOpts...)
+	s := r.MakeClusterSpec(hw.nodes, clusterOpts...)
+	if s.Cloud == "aws" && s.VolumeSize != 0 && s.Mem != spec.Low {
+		// Work around an issue that RAID0s local NVMe and GP3 storage together:
+		// https://github.com/cockroachdb/cockroach/issues/98783.
+		//
+		// This should be removed once we have found a real solution that avoids
+		// ever creating such a RAID.
+		s.InstanceType = spec.AWSMachineType(s.CPUs, s.Mem)
+		s.InstanceType = strings.Replace(s.InstanceType, "d.", ".", 1)
+	}
+	return s
 }
 
 // String prints the hardware specs. If verbose==true, verbose specs are printed.