diff --git a/conf/layer.conf b/conf/layer.conf
index 26beb02..46fa5a8 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -14,4 +14,4 @@ LAYERVERSION_meta-sunxi = "1"
 
 LAYERDEPENDS_meta-sunxi = "core openembedded-layer"
 
-LAYERSERIES_COMPAT_meta-sunxi = "morty pyro rocko sumo thud warrior"
+LAYERSERIES_COMPAT_meta-sunxi = "warrior"
diff --git a/conf/machine/include/sun50i.inc b/conf/machine/include/sun50i.inc
index 3cb8283..380dc15 100644
--- a/conf/machine/include/sun50i.inc
+++ b/conf/machine/include/sun50i.inc
@@ -1,4 +1,6 @@
 require conf/machine/include/sunxi64.inc
-require conf/machine/include/arm/arch-armv8a.inc
+
+DEFAULTTUNE ?= "cortexa53-crypto"
+require conf/machine/include/tune-cortexa53.inc
 
 SOC_FAMILY = "sun50i"