diff --git a/.gitmodules b/.gitmodules
index 87a6549..2f0a760 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -376,9 +376,6 @@
 [submodule "update-alternatives"]
 	path = update-alternatives
 	url = ../../rpm/dpkg.git
-[submodule "kernel-default"]
-	path = kernel-default
-	url = ../../rpm/kernel-source.git
 [submodule "dummy-release"]
 	path = dummy-release
 	url = ../../rpm/dummy-release.git
@@ -396,3 +393,6 @@
 [submodule "perl-YAML-LibYAML"]
 	path = perl-YAML-LibYAML
 	url = ../../rpm/perl-YAML-LibYAML.git
+[submodule "kernel-source"]
+	path = kernel-source
+	url = ../../rpm/kernel-source.git
diff --git a/getconfig b/getconfig
index 8c6054e..eebf43f 100755
--- a/getconfig
+++ b/getconfig
@@ -12,6 +12,10 @@ Macros:
 %disable_32bit 1
 :Macros
 
+%if "%_project" == "openSUSE:Factory:Rings:0-Bootstrap" || "%_project" == "openSUSE:Factory:ARM:Rings:0-Bootstrap"
+BuildFlags: excludebuild:kernel-source
+%endif
+
 EOF
 cat _config.factory _config.ring0 >> _config.new
 sed -i -e "/^RepoURL:/s,/tumbleweed,/history/$version/tumbleweed," _config.new
diff --git a/kernel-default b/kernel-default
deleted file mode 160000
index 0f3141a..0000000
--- a/kernel-default
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0f3141a8c51b2e5ac3f0a099250f31f31b84a1d2
diff --git a/kernel-default/_link b/kernel-default/_link
new file mode 100644
index 0000000..30267fc
--- /dev/null
+++ b/kernel-default/_link
@@ -0,0 +1 @@
+<link package='kernel-source' cicount='copy' />
diff --git a/kernel-obs-build/_link b/kernel-obs-build/_link
new file mode 100644
index 0000000..30267fc
--- /dev/null
+++ b/kernel-obs-build/_link
@@ -0,0 +1 @@
+<link package='kernel-source' cicount='copy' />
diff --git a/kernel-source b/kernel-source
new file mode 160000
index 0000000..4566bf1
--- /dev/null
+++ b/kernel-source
@@ -0,0 +1 @@
+Subproject commit 4566bf1c9760f16b139a26e6bef6f414d3fd9a2f