diff --git a/config/dt-base.yaml b/config/dt-base.yaml
index 77ed1a0947cccfe1e6b7a88fddafd915d88afdee..2ba5814fc070b20b178afd47b40dd7dd41a1e2e1 100644
--- a/config/dt-base.yaml
+++ b/config/dt-base.yaml
@@ -15,7 +15,7 @@ build:
   dt:
     repo:
       remote: git://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git
-      revision: v6.0-dts
+      revision: v6.1-dts
 
     toolchain: aarch64-none-elf-
 
diff --git a/config/edk2-base.yaml b/config/edk2-base.yaml
index 2314284506996cacc475698aa76202a8c6b99874..daf779a8d4e84d999034e2a3f0d1c747d89e8df2 100644
--- a/config/edk2-base.yaml
+++ b/config/edk2-base.yaml
@@ -13,13 +13,13 @@ build:
     repo:
       edk2:
         remote: https://github.com/tianocore/edk2.git
-        revision: edk2-stable202208
+        revision: edk2-stable202211
       edk2-platforms:
         remote: https://github.com/tianocore/edk2-platforms.git
-        revision: ad00518399fc624688d434321693439062c39bde
+        revision: 20e07099d8f11889d101dd710ca85001be20e179
       acpica:
         remote: https://github.com/acpica/acpica.git
-        revision: R03_31_22
+        revision: R10_20_22
 
     toolchain: aarch64-none-elf-
 
diff --git a/config/hafnium-base.yaml b/config/hafnium-base.yaml
index d10323218ce440e4d884125d00eda8cc9f678fbe..0c750fa4893069e7619ff667c4f476bb45f7f89a 100644
--- a/config/hafnium-base.yaml
+++ b/config/hafnium-base.yaml
@@ -10,7 +10,7 @@ build:
   hafnium:
     repo:
       remote: https://git.trustedfirmware.org/hafnium/hafnium.git
-      revision: v2.7
+      revision: v2.8
 
     toolchain: aarch64-none-elf-
 
diff --git a/config/linux-base.yaml b/config/linux-base.yaml
index f83613a5c4aa752a6544d6856615bb857b51b8fa..bb31dad17378834d4c7806f930241150e30f1eb3 100644
--- a/config/linux-base.yaml
+++ b/config/linux-base.yaml
@@ -16,7 +16,7 @@ build:
   linux:
     repo:
       remote: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
-      revision: v6.0
+      revision: v6.1
 
     toolchain: aarch64-none-elf-
 
diff --git a/config/tfa-base.yaml b/config/tfa-base.yaml
index e96b2313632e6b353c91f2ba4368d3a9a39ae5ab..8083ca060ae212563807ac003d61afcf7480e747 100644
--- a/config/tfa-base.yaml
+++ b/config/tfa-base.yaml
@@ -11,7 +11,7 @@ build:
   tfa:
     repo:
       remote: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git
-      revision: v2.7.0
+      revision: v2.8.0
 
     toolchain: aarch64-none-elf-
 
diff --git a/test/test.py b/test/test.py
index 8d8f677fe7d553651adc77eda192148239ed7e71..2380436bfcb172aee5d686f4399f7a6a5b715bac 100755
--- a/test/test.py
+++ b/test/test.py
@@ -159,13 +159,15 @@ def run_config_bootwrap(config, bootwrap, rootfs, overlay=None, runtime=120):
 	run_config(config, overlay, f'{bootwrap} {rootfs}', runtime)
 
 
-def do_main():
-	for arch in ARCHES:
+def do_main(smoke_test):
+	arches = [ARCHES[-1]] if smoke_test else ARCHES
+
+	for arch in arches:
 		build_configs(CONFIGS, arch)
 		for config in CONFIGS:
 			run_config_kern(config, KERNEL, ROOTFS, arch)
 
-	for arch in ARCHES:
+	for arch in arches:
 		build_configs(['bootwrapper.yaml'], arch)
 		run_config_bootwrap('bootwrapper.yaml', BOOTWRAPPER, ROOTFS, arch)
 
@@ -192,6 +194,10 @@ def main():
 		help="""If using a container runtime, specifies the name of the
 		     image to use. Defaults to the official shrinkwrap image.""")
 
+	parser.add_argument('-s', '--smoke-test',
+		required=False, default=False, action='store_true',
+		help="""If specified, run a smaller selection of tests.""")
+
 	args = parser.parse_args()
 
 	global RUNTIME
@@ -199,7 +205,7 @@ def main():
 	RUNTIME = args.runtime
 	IMAGE = args.image
 
-	do_main()
+	do_main(args.smoke_test)
 
 
 if __name__ == "__main__":