diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
index 91cb6d2e0..1f93142ad 100644
--- a/.github/workflows/debian.yml
+++ b/.github/workflows/debian.yml
@@ -74,7 +74,7 @@ jobs:
           debian.master/config/amd64/config.common.amd64      \
           debian.master/config/amd64/config.flavour.generic   \
           ../ubuntu.config                                    \
-          ../surface.config
+          ../../../configs/surface-${KERNEL_VERSION%.*}.config
 
     - name: Setup secureboot certificate
       env:
diff --git a/.github/workflows/debian_lts.yml b/.github/workflows/debian_lts.yml
index d1e115eb6..c0b11227c 100644
--- a/.github/workflows/debian_lts.yml
+++ b/.github/workflows/debian_lts.yml
@@ -74,7 +74,7 @@ jobs:
           debian.master/config/amd64/config.common.amd64      \
           debian.master/config/amd64/config.flavour.generic   \
           ../ubuntu.config                                    \
-          ../surface.config
+          ../../../configs/surface-${KERNEL_VERSION%.*}.config
 
     - name: Setup secureboot certificate
       env:
diff --git a/configs/surface-4.19.config b/configs/surface-4.19.config
new file mode 100644
index 000000000..af998b7ed
--- /dev/null
+++ b/configs/surface-4.19.config
@@ -0,0 +1,30 @@
+#
+# Intel IPTS Touchscreen
+#
+CONFIG_INTEL_IPTS=m
+CONFIG_INTEL_IPTS_SURFACE=m
+
+#
+# Surface Aggregator Module
+#
+CONFIG_SURFACE_SAM=m
+CONFIG_SURFACE_SAM_SSH=m
+CONFIG_SURFACE_SAM_SSH_DEBUG_DEVICE=y
+CONFIG_SURFACE_SAM_SAN=m
+CONFIG_SURFACE_SAM_VHF=m
+CONFIG_SURFACE_SAM_DTX=m
+CONFIG_SURFACE_SAM_HPS=m
+CONFIG_SURFACE_SAM_SID=m
+CONFIG_SURFACE_SAM_SID_GPELID=m
+CONFIG_SURFACE_SAM_SID_PERFMODE=m
+CONFIG_SURFACE_SAM_SID_VHF=m
+CONFIG_SURFACE_SAM_SID_POWER=m
+
+#
+# Other Drivers
+#
+CONFIG_INPUT_SOC_BUTTON_ARRAY=m
+CONFIG_SURFACE_3_POWER_OPREGION=m
+CONFIG_SURFACE_3_BUTTON=m
+CONFIG_SURFACE_3_POWER_OPREGION=m
+CONFIG_SURFACE_PRO3_BUTTON=m
diff --git a/surface.config b/configs/surface-5.5.config
similarity index 100%
rename from surface.config
rename to configs/surface-5.5.config
diff --git a/pkg/arch/kernel-lts/surface.config b/pkg/arch/kernel-lts/surface.config
deleted file mode 100644
index af998b7ed..000000000
--- a/pkg/arch/kernel-lts/surface.config
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Intel IPTS Touchscreen
-#
-CONFIG_INTEL_IPTS=m
-CONFIG_INTEL_IPTS_SURFACE=m
-
-#
-# Surface Aggregator Module
-#
-CONFIG_SURFACE_SAM=m
-CONFIG_SURFACE_SAM_SSH=m
-CONFIG_SURFACE_SAM_SSH_DEBUG_DEVICE=y
-CONFIG_SURFACE_SAM_SAN=m
-CONFIG_SURFACE_SAM_VHF=m
-CONFIG_SURFACE_SAM_DTX=m
-CONFIG_SURFACE_SAM_HPS=m
-CONFIG_SURFACE_SAM_SID=m
-CONFIG_SURFACE_SAM_SID_GPELID=m
-CONFIG_SURFACE_SAM_SID_PERFMODE=m
-CONFIG_SURFACE_SAM_SID_VHF=m
-CONFIG_SURFACE_SAM_SID_POWER=m
-
-#
-# Other Drivers
-#
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_SURFACE_3_POWER_OPREGION=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE_3_POWER_OPREGION=m
-CONFIG_SURFACE_PRO3_BUTTON=m
diff --git a/pkg/arch/kernel-lts/surface.config b/pkg/arch/kernel-lts/surface.config
new file mode 120000
index 000000000..13de293da
--- /dev/null
+++ b/pkg/arch/kernel-lts/surface.config
@@ -0,0 +1 @@
+../../../configs/surface-4.19.config
\ No newline at end of file
diff --git a/pkg/arch/kernel/surface.config b/pkg/arch/kernel/surface.config
index a34a4de7c..b5a438811 120000
--- a/pkg/arch/kernel/surface.config
+++ b/pkg/arch/kernel/surface.config
@@ -1 +1 @@
-../../../surface.config
\ No newline at end of file
+../../../configs/surface-5.5.config
\ No newline at end of file
diff --git a/pkg/debian/surface.config b/pkg/debian/surface.config
deleted file mode 120000
index d3df0a1ab..000000000
--- a/pkg/debian/surface.config
+++ /dev/null
@@ -1 +0,0 @@
-../../surface.config
\ No newline at end of file
diff --git a/pkg/fedora/kernel-surface/kernel-surface.spec b/pkg/fedora/kernel-surface/kernel-surface.spec
index 955d37969..90a9a8076 100755
--- a/pkg/fedora/kernel-surface/kernel-surface.spec
+++ b/pkg/fedora/kernel-surface/kernel-surface.spec
@@ -70,7 +70,7 @@ Conflicts: xorg-x11-drv-vmmouse < 13.0.99
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
 
 Source0:    %{fedora_source}/snapshot/fedora-%{kernel_tag}.tar.gz
-Source1:    %{surface_source}/surface.config
+Source1:    %{surface_source}/configs/surface-%{kernel_majorver}.config
 Source2:    fedora.config
 
 Source20:    %{sb_crt}