diff --git a/BoardConfig850.mk b/BoardConfig850.mk
index b7d5639..db9a833 100644
--- a/BoardConfig850.mk
+++ b/BoardConfig850.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 The LineageOS Project
+# Copyright (C) 2022-2023 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 
 TARGET_LINUX_KERNEL_VERSION := 4.14
 
-include hardware/samsung_slsi-linaro/config/BoardConfigCommon.mk
-
 USE_OPENGL_RENDERER := true
 NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
 BOARD_USES_EXYNOS5_COMMON_GRALLOC := true
@@ -84,3 +82,5 @@
 
 # MobiCore namespace
 PRODUCT_SOONG_NAMESPACES += hardware/samsung_slsi-linaro/exynos/tee/kinibi500
+
+include hardware/samsung_slsi-linaro/config/BoardConfigCommon.mk
diff --git a/BoardConfig8895.mk b/BoardConfig8895.mk
index c3e8e38..bfea06a 100644
--- a/BoardConfig8895.mk
+++ b/BoardConfig8895.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 The LineageOS Project
+# Copyright (C) 2022-2023 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 
 TARGET_LINUX_KERNEL_VERSION := 4.4
 
-include hardware/samsung_slsi-linaro/config/BoardConfigCommon.mk
-
 USE_OPENGL_RENDERER := true
 NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
 BOARD_USES_EXYNOS5_COMMON_GRALLOC := true
@@ -61,3 +59,5 @@
 
 # Acryl
 BOARD_LIBACRYL_DEFAULT_COMPOSITOR := fimg2d_8895
+
+include hardware/samsung_slsi-linaro/config/BoardConfigCommon.mk
diff --git a/BoardConfig9610.mk b/BoardConfig9610.mk
index d1d6c1f..55a1bf9 100644
--- a/BoardConfig9610.mk
+++ b/BoardConfig9610.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 The LineageOS Project
+# Copyright (C) 2022-2023 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,8 +18,6 @@
 
 TARGET_SOC_BASE := exynos9610
 
-include hardware/samsung_slsi-linaro/config/BoardConfigCommon.mk
-
 USE_OPENGL_RENDERER := true
 NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
 BOARD_USES_EXYNOS5_COMMON_GRALLOC := true
@@ -94,3 +92,5 @@
 # MobiCore namespace
 PRODUCT_SOONG_NAMESPACES += hardware/samsung_slsi-linaro/exynos/tee/kinibi410
 endif
+
+include hardware/samsung_slsi-linaro/config/BoardConfigCommon.mk
diff --git a/BoardConfig9810.mk b/BoardConfig9810.mk
index 6ba9336..654ab14 100644
--- a/BoardConfig9810.mk
+++ b/BoardConfig9810.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 The LineageOS Project
+# Copyright (C) 2022-2023 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 
 TARGET_LINUX_KERNEL_VERSION := 4.4
 
-include hardware/samsung_slsi-linaro/config/BoardConfigCommon.mk
-
 USE_OPENGL_RENDERER := true
 NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
 BOARD_USES_EXYNOS5_COMMON_GRALLOC := true
@@ -75,3 +73,5 @@
 BOARD_LIBACRYL_DEFAULT_SCALER := mscl_9810
 BOARD_LIBACRYL_DEFAULT_BLTER := fimg2d_9810_blter
 BOARD_LIBACRYL_G2D9810_HDR_PLUGIN := libacryl_plugin_slsi_hdr10
+
+include hardware/samsung_slsi-linaro/config/BoardConfigCommon.mk
diff --git a/BoardConfig9820.mk b/BoardConfig9820.mk
index 7b7e684..9a863aa 100644
--- a/BoardConfig9820.mk
+++ b/BoardConfig9820.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 The LineageOS Project
+# Copyright (C) 2022-2023 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,8 +18,6 @@
 
 TARGET_SOC_BASE := exynos9820
 
-include hardware/samsung_slsi-linaro/config/BoardConfigCommon.mk
-
 USE_OPENGL_RENDERER := true
 NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
 BOARD_USES_EXYNOS5_COMMON_GRALLOC := true
@@ -71,3 +69,5 @@
 BOARD_LIBACRYL_DEFAULT_SCALER := mscl_9810
 BOARD_LIBACRYL_DEFAULT_BLTER := fimg2d_9810_blter
 BOARD_LIBACRYL_G2D9810_HDR_PLUGIN := libacryl_plugin_slsi_hdr10
+
+include hardware/samsung_slsi-linaro/config/BoardConfigCommon.mk
diff --git a/BoardConfig990.mk b/BoardConfig990.mk
index d298455..f0d461f 100644
--- a/BoardConfig990.mk
+++ b/BoardConfig990.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 The LineageOS Project
+# Copyright (C) 2022-2023 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,8 +18,6 @@
 
 TARGET_SOC_BASE := exynos990
 
-include hardware/samsung_slsi-linaro/config/BoardConfigCommon.mk
-
 # Gralloc
 BOARD_USES_EXYNOS5_COMMON_GRALLOC := true
 BOARD_USES_EXYNOS_GRALLOC_VERSION := 3
@@ -61,3 +59,5 @@
 BOARD_LIBACRYL_DEFAULT_SCALER := mscl_9810
 BOARD_LIBACRYL_DEFAULT_BLTER := fimg2d_9810_blter
 BOARD_LIBACRYL_G2D9810_HDR_PLUGIN := libacryl_plugin_slsi_hdr10
+
+include hardware/samsung_slsi-linaro/config/BoardConfigCommon.mk
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index fbdcb50..ac92c54 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -18,3 +18,25 @@
 TARGET_SLSI_VARIANT := linaro
 TARGET_SOC_NAME := exynos
 BOARD_USES_DT := true
+
+# Acryl
+ifneq ($(BOARD_LIBACRYL_DEFAULT_COMPOSITOR),)
+$(call soong_config_set,libacryl,default_compositor,$(BOARD_LIBACRYL_DEFAULT_COMPOSITOR))
+endif
+ifneq ($(BOARD_LIBACRYL_DEFAULT_SCALER),)
+$(call soong_config_set,libacryl,default_scaler,$(BOARD_LIBACRYL_DEFAULT_SCALER))
+endif
+ifneq ($(BOARD_LIBACRYL_DEFAULT_BLTER),)
+$(call soong_config_set,libacryl,default_blter,$(BOARD_LIBACRYL_DEFAULT_BLTER))
+endif
+ifneq ($(BOARD_LIBACRYL_G2D9810_HDR_PLUGIN),)
+$(call soong_config_set,libacryl,g2d9810_hdr_plugin,$(BOARD_LIBACRYL_G2D9810_HDR_PLUGIN))
+endif
+
+# exynosgraphicbuffer
+ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),3)
+$(call soong_config_set,exynosgraphicbuffer,gralloc_version,three)
+endif
+ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),4)
+$(call soong_config_set,exynosgraphicbuffer,gralloc_version,four)
+endif