diff --git a/internal/attestation/measurements/measurements_enterprise.go b/internal/attestation/measurements/measurements_enterprise.go
index 9ed7659dd..3f01cb0a1 100644
--- a/internal/attestation/measurements/measurements_enterprise.go
+++ b/internal/attestation/measurements/measurements_enterprise.go
@@ -44,19 +44,19 @@ func DefaultsFor(provider cloudprovider.Provider) M {
 			},
 			4: {
 				Expected: [32]byte{
-					0xb3, 0x51, 0x44, 0x90, 0xae, 0xd3, 0x1d, 0xf8,
-					0xf2, 0x19, 0x64, 0x10, 0x79, 0x53, 0x33, 0xe3,
-					0x94, 0xfa, 0x22, 0x5a, 0x7a, 0xe6, 0xdb, 0xe3,
-					0x8c, 0x53, 0xd6, 0xfd, 0x5a, 0xe3, 0x60, 0x54,
+					0x58, 0x75, 0x6b, 0x91, 0x89, 0x84, 0xeb, 0x5a,
+					0xbc, 0x0d, 0xf8, 0xd7, 0x76, 0xea, 0xd6, 0x1b,
+					0x56, 0x39, 0xa6, 0x6c, 0x27, 0x79, 0xa4, 0x78,
+					0x72, 0x69, 0xb4, 0x71, 0x5d, 0x97, 0x12, 0x7d,
 				},
 				WarnOnly: false,
 			},
 			5: {
 				Expected: [32]byte{
-					0x1f, 0xf1, 0xac, 0xad, 0x3e, 0x81, 0xb9, 0xac,
-					0xb3, 0x13, 0x4d, 0xed, 0xe0, 0x2f, 0x72, 0xdb,
-					0x42, 0x6f, 0x0a, 0x04, 0xe6, 0x29, 0x54, 0x6d,
-					0x63, 0x70, 0xd5, 0x7b, 0xa1, 0x9c, 0xab, 0x60,
+					0x98, 0x09, 0x28, 0xe9, 0x26, 0x20, 0x78, 0x2b,
+					0xff, 0xfe, 0xc4, 0x37, 0x5d, 0x44, 0x66, 0x22,
+					0xc6, 0xdd, 0x5b, 0xd1, 0x98, 0x33, 0xfb, 0xda,
+					0xf5, 0x58, 0x2b, 0xb9, 0x38, 0x92, 0xbc, 0xee,
 				},
 				WarnOnly: true,
 			},
@@ -89,10 +89,10 @@ func DefaultsFor(provider cloudprovider.Provider) M {
 			},
 			9: {
 				Expected: [32]byte{
-					0x22, 0xe0, 0xe4, 0x1f, 0x7a, 0xea, 0xf7, 0x6a,
-					0x4d, 0x4f, 0xa5, 0x3b, 0x22, 0xb4, 0x1b, 0xf0,
-					0x0f, 0x78, 0xda, 0xf6, 0x90, 0xc1, 0x90, 0x2a,
-					0xa1, 0x71, 0xcf, 0x5c, 0x30, 0x33, 0x72, 0x8b,
+					0x56, 0x32, 0x73, 0x5e, 0xcc, 0x9d, 0x45, 0x33,
+					0xf5, 0x2d, 0xc3, 0x57, 0xd1, 0xf0, 0xd8, 0x4e,
+					0x86, 0xf4, 0xfd, 0xc2, 0x89, 0x09, 0x6e, 0xb2,
+					0x99, 0xa8, 0x59, 0x0f, 0xd2, 0xf0, 0x44, 0x8a,
 				},
 				WarnOnly: false,
 			},
@@ -107,10 +107,10 @@ func DefaultsFor(provider cloudprovider.Provider) M {
 			},
 			12: {
 				Expected: [32]byte{
-					0x32, 0x76, 0xad, 0x0c, 0xec, 0xf5, 0xfd, 0xba,
-					0x77, 0xf6, 0xd6, 0x25, 0x3c, 0xaf, 0x9f, 0xd0,
-					0x90, 0x03, 0xbe, 0x88, 0xd3, 0x96, 0xfd, 0xf5,
-					0xf2, 0xce, 0x0c, 0x8c, 0xa9, 0xac, 0x67, 0xe3,
+					0xd5, 0x04, 0x41, 0xce, 0x5f, 0xea, 0xa5, 0x1a,
+					0x17, 0x94, 0x2d, 0x7f, 0xe0, 0x3c, 0xce, 0x5f,
+					0x25, 0x1e, 0x7f, 0x53, 0x81, 0xba, 0x78, 0x3f,
+					0x55, 0x31, 0xc2, 0xf8, 0xfb, 0xb6, 0xfa, 0x15,
 				},
 				WarnOnly: false,
 			},
@@ -173,19 +173,19 @@ func DefaultsFor(provider cloudprovider.Provider) M {
 			},
 			4: {
 				Expected: [32]byte{
-					0xb6, 0xcb, 0xb2, 0x18, 0xdc, 0x45, 0xc3, 0x45,
-					0x46, 0xb1, 0xd9, 0x90, 0x7d, 0x9b, 0x35, 0xbf,
-					0x9f, 0x4e, 0x36, 0x35, 0xe1, 0xb9, 0x80, 0xdc,
-					0x21, 0x9f, 0x60, 0x7e, 0xa1, 0x37, 0xcd, 0x6b,
+					0x7b, 0x33, 0x94, 0xd0, 0x81, 0x79, 0x41, 0x4b,
+					0x01, 0x34, 0x14, 0x61, 0xbc, 0xcd, 0xa4, 0x5b,
+					0xc6, 0x2b, 0x2d, 0x4b, 0x0e, 0x47, 0x04, 0xc8,
+					0x81, 0xe8, 0x5f, 0xb6, 0xa8, 0xe8, 0xcb, 0x61,
 				},
 				WarnOnly: false,
 			},
 			5: {
 				Expected: [32]byte{
-					0x64, 0x21, 0x98, 0xf5, 0x87, 0x5c, 0xb7, 0x35,
-					0x0c, 0xb5, 0x99, 0x56, 0xa6, 0x1b, 0xde, 0x1b,
-					0x95, 0xff, 0x15, 0xbe, 0x5e, 0x92, 0x7f, 0x44,
-					0xc1, 0xef, 0xfa, 0xfe, 0x3e, 0x88, 0x9a, 0x94,
+					0xd2, 0x6b, 0x55, 0x6b, 0x72, 0xed, 0x82, 0xe1,
+					0x27, 0x83, 0x9d, 0x96, 0xf8, 0xe0, 0x7c, 0x36,
+					0xc7, 0x46, 0xa1, 0xdb, 0x4e, 0xab, 0x10, 0x2e,
+					0x9d, 0x46, 0x2f, 0xbc, 0x3b, 0xa6, 0x56, 0x60,
 				},
 				WarnOnly: true,
 			},
@@ -209,10 +209,10 @@ func DefaultsFor(provider cloudprovider.Provider) M {
 			},
 			9: {
 				Expected: [32]byte{
-					0x22, 0xe0, 0xe4, 0x1f, 0x7a, 0xea, 0xf7, 0x6a,
-					0x4d, 0x4f, 0xa5, 0x3b, 0x22, 0xb4, 0x1b, 0xf0,
-					0x0f, 0x78, 0xda, 0xf6, 0x90, 0xc1, 0x90, 0x2a,
-					0xa1, 0x71, 0xcf, 0x5c, 0x30, 0x33, 0x72, 0x8b,
+					0x8d, 0x0e, 0x87, 0x01, 0x0f, 0xa3, 0x2f, 0x17,
+					0xc3, 0xa1, 0xbe, 0x2e, 0xd2, 0x58, 0xa6, 0xd5,
+					0x29, 0x07, 0xc9, 0xc2, 0xfb, 0x0e, 0xab, 0xf1,
+					0xb7, 0x10, 0x50, 0x92, 0x6c, 0xc3, 0xe6, 0x1b,
 				},
 				WarnOnly: false,
 			},
@@ -227,10 +227,10 @@ func DefaultsFor(provider cloudprovider.Provider) M {
 			},
 			12: {
 				Expected: [32]byte{
-					0x6f, 0xcb, 0x53, 0xd9, 0x95, 0xff, 0xd6, 0x0b,
-					0xc1, 0x10, 0x23, 0xc9, 0x1a, 0x0c, 0xe5, 0x23,
-					0x46, 0xc0, 0x03, 0xea, 0x28, 0x07, 0xae, 0x2d,
-					0x8f, 0x82, 0xec, 0x3f, 0xd9, 0x4b, 0xb2, 0xb5,
+					0x7c, 0x79, 0x3c, 0xdf, 0x4e, 0xcc, 0x2a, 0x0c,
+					0xdf, 0xba, 0x01, 0x82, 0xbc, 0x3b, 0x24, 0x88,
+					0xe0, 0x06, 0xbc, 0x85, 0x50, 0x58, 0x82, 0x4b,
+					0x6a, 0x6e, 0xd8, 0xd8, 0x78, 0x39, 0xca, 0xe5,
 				},
 				WarnOnly: false,
 			},
@@ -302,19 +302,19 @@ func DefaultsFor(provider cloudprovider.Provider) M {
 			},
 			4: {
 				Expected: [32]byte{
-					0x5c, 0x08, 0x21, 0x69, 0x2b, 0x19, 0x0d, 0x92,
-					0xd0, 0xfa, 0xbb, 0xe6, 0xe4, 0xde, 0x8f, 0xbb,
-					0x4f, 0xae, 0xdf, 0xd0, 0x57, 0xf9, 0xbb, 0xd3,
-					0x0b, 0x4f, 0x34, 0xaf, 0xe1, 0x0d, 0xed, 0x85,
+					0x74, 0x0d, 0x4b, 0x09, 0x6a, 0x9b, 0x8f, 0x46,
+					0x9c, 0xe2, 0x5f, 0x93, 0x62, 0xdd, 0x3f, 0xa6,
+					0x88, 0x28, 0x45, 0xfd, 0xe5, 0xb4, 0x2e, 0x56,
+					0xac, 0x06, 0x69, 0x11, 0x49, 0x49, 0x20, 0xbf,
 				},
 				WarnOnly: false,
 			},
 			5: {
 				Expected: [32]byte{
-					0x9d, 0x5f, 0x8c, 0x2e, 0x04, 0x64, 0xc6, 0x95,
-					0x52, 0xe5, 0x93, 0xbe, 0x32, 0xa4, 0xb0, 0x89,
-					0xf7, 0xe7, 0x7f, 0x4e, 0xd1, 0x2d, 0x60, 0xcd,
-					0xcd, 0x94, 0x12, 0x0b, 0x6c, 0xca, 0xcc, 0xf8,
+					0x62, 0x88, 0x87, 0x63, 0x7b, 0xd1, 0x6e, 0xcd,
+					0xe7, 0x9f, 0x9c, 0x79, 0x64, 0xe4, 0x12, 0xc6,
+					0x88, 0x83, 0xfb, 0x57, 0x1c, 0xe6, 0xdc, 0x74,
+					0xde, 0xff, 0x11, 0x8c, 0xe5, 0xaa, 0xe8, 0x35,
 				},
 				WarnOnly: true,
 			},
@@ -347,19 +347,19 @@ func DefaultsFor(provider cloudprovider.Provider) M {
 			},
 			9: {
 				Expected: [32]byte{
-					0x5f, 0xa5, 0xd5, 0x21, 0xd8, 0xfc, 0xe9, 0xd1,
-					0xbb, 0xb0, 0x63, 0x67, 0x4b, 0x3b, 0x5b, 0x63,
-					0xbd, 0x5d, 0xee, 0x6f, 0x0f, 0xda, 0xb6, 0x76,
-					0x7e, 0x00, 0x8c, 0xd3, 0xbf, 0xfe, 0x7f, 0xf6,
+					0x6a, 0x8d, 0xa1, 0x07, 0xe5, 0xfb, 0xca, 0x6c,
+					0x00, 0x8e, 0xf8, 0x84, 0x58, 0xe3, 0x35, 0x3f,
+					0x27, 0x09, 0x98, 0x45, 0xda, 0x23, 0x36, 0xc4,
+					0xda, 0x59, 0x2d, 0xdb, 0x94, 0x79, 0x70, 0xc9,
 				},
 				WarnOnly: false,
 			},
 			10: {
 				Expected: [32]byte{
-					0x7f, 0x96, 0xfb, 0xc5, 0x5e, 0x1d, 0x2a, 0x0d,
-					0xe4, 0x6e, 0x5d, 0x44, 0x65, 0x8c, 0x06, 0xef,
-					0x10, 0x2d, 0x11, 0x98, 0x70, 0x3e, 0xfa, 0x69,
-					0xf2, 0xea, 0x6b, 0x5a, 0xa1, 0xc9, 0xa1, 0x76,
+					0x66, 0x03, 0x42, 0x8e, 0x8f, 0xab, 0x0c, 0xed,
+					0x71, 0xd2, 0x64, 0xec, 0x6a, 0xa2, 0xc4, 0x36,
+					0x3f, 0xb8, 0x06, 0xe4, 0xe1, 0xb2, 0x98, 0xfc,
+					0xe4, 0x54, 0xd9, 0xcf, 0x4d, 0x44, 0x52, 0x15,
 				},
 				WarnOnly: true,
 			},
@@ -374,10 +374,10 @@ func DefaultsFor(provider cloudprovider.Provider) M {
 			},
 			12: {
 				Expected: [32]byte{
-					0xb8, 0x24, 0x89, 0x10, 0xeb, 0xe1, 0x19, 0x1c,
-					0x29, 0x46, 0x37, 0x37, 0x57, 0xf8, 0xe4, 0xd6,
-					0x5d, 0x88, 0x34, 0xa7, 0x2b, 0xc8, 0x35, 0x69,
-					0xc2, 0x90, 0x52, 0xa7, 0xe7, 0x84, 0x15, 0xe4,
+					0x3a, 0x92, 0x94, 0x70, 0x27, 0x12, 0x5a, 0x16,
+					0xfd, 0x78, 0x10, 0x2b, 0x5f, 0x81, 0x05, 0xad,
+					0x98, 0xdc, 0x7b, 0xd8, 0x0d, 0x9d, 0x03, 0x1e,
+					0xdf, 0xb2, 0x13, 0xbb, 0x50, 0xa5, 0x85, 0x5d,
 				},
 				WarnOnly: false,
 			},
@@ -411,78 +411,15 @@ func DefaultsFor(provider cloudprovider.Provider) M {
 		}
 	case cloudprovider.QEMU:
 		return M{
-			0: {
-				Expected: [32]byte{
-					0x7d, 0x08, 0x99, 0x70, 0x28, 0xf3, 0x4f, 0x6c,
-					0xcd, 0xd2, 0xed, 0x9b, 0xd3, 0x18, 0x04, 0xcf,
-					0x0b, 0x0c, 0x7f, 0xff, 0x9a, 0x4d, 0x05, 0x29,
-					0x9e, 0x33, 0x62, 0x00, 0x01, 0x51, 0x02, 0x81,
-				},
-				WarnOnly: true,
-			},
-			1: {
-				Expected: [32]byte{
-					0xee, 0x07, 0x10, 0x2d, 0x14, 0x18, 0x51, 0x80,
-					0x24, 0x11, 0x08, 0x72, 0xa7, 0x13, 0xa9, 0x82,
-					0x4b, 0xc7, 0xf6, 0xae, 0x47, 0xd6, 0x2f, 0xd0,
-					0xcd, 0xe0, 0x91, 0x8c, 0x0e, 0x24, 0x9b, 0x7e,
-				},
-				WarnOnly: true,
-			},
-			2: {
-				Expected: [32]byte{
-					0x72, 0x00, 0x1a, 0x25, 0x20, 0x1b, 0x26, 0x3b,
-					0xc6, 0x0f, 0x86, 0x9a, 0xce, 0x2f, 0x72, 0x8b,
-					0x09, 0xdc, 0x4b, 0xe7, 0x8b, 0x9c, 0x80, 0xad,
-					0xca, 0x87, 0xa0, 0x13, 0xc2, 0xd2, 0x69, 0x50,
-				},
-				WarnOnly: true,
-			},
-			3: {
-				Expected: [32]byte{
-					0x3d, 0x45, 0x8c, 0xfe, 0x55, 0xcc, 0x03, 0xea,
-					0x1f, 0x44, 0x3f, 0x15, 0x62, 0xbe, 0xec, 0x8d,
-					0xf5, 0x1c, 0x75, 0xe1, 0x4a, 0x9f, 0xcf, 0x9a,
-					0x72, 0x34, 0xa1, 0x3f, 0x19, 0x8e, 0x79, 0x69,
-				},
-				WarnOnly: true,
-			},
 			4: {
 				Expected: [32]byte{
-					0x83, 0x5a, 0xe5, 0x47, 0xbf, 0x27, 0x52, 0x5d,
-					0x17, 0x3e, 0xdb, 0xec, 0xe7, 0x1e, 0x31, 0xed,
-					0xea, 0xde, 0x0b, 0xf8, 0x9d, 0x18, 0xf4, 0x46,
-					0xd0, 0x97, 0xd7, 0xfc, 0xa0, 0x3e, 0x13, 0xe0,
+					0xeb, 0xb4, 0xa7, 0xb0, 0xc0, 0x67, 0x24, 0x53,
+					0xdb, 0xb4, 0x11, 0x5c, 0x0d, 0xb9, 0xae, 0x8c,
+					0x2c, 0x60, 0x8b, 0xaa, 0xa6, 0x82, 0x37, 0xa3,
+					0xa7, 0x97, 0x44, 0xe3, 0x6c, 0xf5, 0xa9, 0x55,
 				},
 				WarnOnly: false,
 			},
-			5: {
-				Expected: [32]byte{
-					0xc9, 0x39, 0x8a, 0xd4, 0x14, 0x99, 0x7a, 0x41,
-					0x35, 0xb1, 0x08, 0xdf, 0xf7, 0xc1, 0x8c, 0x15,
-					0x33, 0xd7, 0x03, 0x95, 0x04, 0x5e, 0x93, 0x94,
-					0xf8, 0xce, 0xe6, 0x97, 0x44, 0xf7, 0x84, 0xbd,
-				},
-				WarnOnly: true,
-			},
-			6: {
-				Expected: [32]byte{
-					0x3d, 0x45, 0x8c, 0xfe, 0x55, 0xcc, 0x03, 0xea,
-					0x1f, 0x44, 0x3f, 0x15, 0x62, 0xbe, 0xec, 0x8d,
-					0xf5, 0x1c, 0x75, 0xe1, 0x4a, 0x9f, 0xcf, 0x9a,
-					0x72, 0x34, 0xa1, 0x3f, 0x19, 0x8e, 0x79, 0x69,
-				},
-				WarnOnly: true,
-			},
-			7: {
-				Expected: [32]byte{
-					0xdb, 0xc0, 0xbf, 0x1f, 0xfb, 0xa0, 0x30, 0x7a,
-					0xa4, 0xef, 0xec, 0xb3, 0x76, 0x6d, 0x8a, 0x36,
-					0x55, 0x95, 0xbc, 0x38, 0x4a, 0x3d, 0xcb, 0x87,
-					0xd7, 0xef, 0x9b, 0x5d, 0xcf, 0x44, 0x16, 0x5b,
-				},
-				WarnOnly: true,
-			},
 			8: {
 				Expected: [32]byte{
 					0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -494,22 +431,13 @@ func DefaultsFor(provider cloudprovider.Provider) M {
 			},
 			9: {
 				Expected: [32]byte{
-					0x22, 0xe0, 0xe4, 0x1f, 0x7a, 0xea, 0xf7, 0x6a,
-					0x4d, 0x4f, 0xa5, 0x3b, 0x22, 0xb4, 0x1b, 0xf0,
-					0x0f, 0x78, 0xda, 0xf6, 0x90, 0xc1, 0x90, 0x2a,
-					0xa1, 0x71, 0xcf, 0x5c, 0x30, 0x33, 0x72, 0x8b,
+					0x1d, 0x89, 0x7a, 0xeb, 0x6a, 0xe5, 0xb3, 0x66,
+					0xf2, 0xd1, 0x75, 0x15, 0xfb, 0x11, 0x3d, 0x85,
+					0x12, 0x94, 0x5d, 0x4d, 0xba, 0x26, 0x26, 0xb6,
+					0x92, 0xef, 0xcc, 0x59, 0x05, 0xe3, 0x55, 0x16,
 				},
 				WarnOnly: false,
 			},
-			10: {
-				Expected: [32]byte{
-					0x70, 0x54, 0x86, 0xf7, 0xf5, 0x2b, 0x61, 0xfe,
-					0xb5, 0xd2, 0x48, 0x30, 0xad, 0x12, 0xaf, 0xbe,
-					0xfb, 0xb2, 0x45, 0xc3, 0xf0, 0xcb, 0x76, 0x74,
-					0x98, 0xbe, 0x50, 0x3c, 0x79, 0xf2, 0x46, 0x66,
-				},
-				WarnOnly: true,
-			},
 			11: {
 				Expected: [32]byte{
 					0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -521,10 +449,10 @@ func DefaultsFor(provider cloudprovider.Provider) M {
 			},
 			12: {
 				Expected: [32]byte{
-					0x13, 0xb1, 0x4a, 0xca, 0xf8, 0x67, 0x50, 0xe3,
-					0x0d, 0x24, 0x42, 0xcd, 0xbb, 0xcb, 0x0a, 0x9f,
-					0x3b, 0x62, 0xfc, 0xc8, 0x8c, 0x05, 0x12, 0xe2,
-					0x67, 0x10, 0xba, 0xbd, 0x52, 0xc3, 0x52, 0x84,
+					0x51, 0xd1, 0x13, 0x57, 0xea, 0x78, 0xf4, 0x12,
+					0xc9, 0xc6, 0x5d, 0xd1, 0x02, 0x25, 0x48, 0x67,
+					0x4f, 0xb6, 0x50, 0x48, 0x81, 0xc0, 0xcf, 0xba,
+					0x84, 0x03, 0x6c, 0xf9, 0x3b, 0x7e, 0x79, 0xaf,
 				},
 				WarnOnly: false,
 			},
@@ -537,15 +465,6 @@ func DefaultsFor(provider cloudprovider.Provider) M {
 				},
 				WarnOnly: false,
 			},
-			14: {
-				Expected: [32]byte{
-					0xfb, 0xfe, 0x27, 0x0f, 0xee, 0x9d, 0x94, 0xd4,
-					0x15, 0x84, 0xab, 0xca, 0x17, 0x94, 0xfb, 0x4a,
-					0x42, 0xcf, 0xcf, 0x9a, 0xb4, 0xbe, 0xab, 0xa4,
-					0x91, 0x29, 0xda, 0xe2, 0x29, 0x51, 0xce, 0xf5,
-				},
-				WarnOnly: true,
-			},
 			15: {
 				Expected: [32]byte{
 					0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -556,6 +475,7 @@ func DefaultsFor(provider cloudprovider.Provider) M {
 				WarnOnly: false,
 			},
 		}
+
 	default:
 		return nil
 	}