diff --git a/build/envsetup.sh b/build/envsetup.sh
index 9a80316425eaad0fbee50afd1ffda458e857aec5..c9e28efe04a88b06a94f9e06c346a6978cad6c83 100644
--- a/build/envsetup.sh
+++ b/build/envsetup.sh
@@ -935,7 +935,7 @@ function build_kernel() {
         echo "Skipping kernel build"
         return
     fi
-    local lineage_version="lineage-$(_get_build_var_cached PRODUCT_VERSION_MAJOR).$(_get_build_var_cached PRODUCT_VERSION_MINOR)"
+    local lineage_version="$(_get_build_var_cached LINEAGE_UPSTREAM_VERSION)"
 
     local target_kernel_device="$(_get_build_var_cached TARGET_KERNEL_DEVICE)"
     local target_kernel_dir="${ANDROID_BUILD_TOP}/$(_get_build_var_cached TARGET_KERNEL_DIR)"
@@ -983,6 +983,9 @@ function build_kernel() {
         if [ -n "${REPO_VERSION}" ]; then
             repo_init_args+=("--repo-rev" "${REPO_VERSION}")
         fi
+        if [ -f "${ANDROID_BUILD_TOP}/.repo/local_manifests/proprietary_gitlab.xml" ]; then
+            repo_init_args+=("-g" "default,-darwin,-muppets,muppets_${LINEAGE_BUILD}")
+        fi
 
         yes | repo init -u https://github.com/LineageOS/${target_kernel_manifest}.git ${repo_init_args[@]} || [ $? -eq 141 ]
         if [ $? -ne 0 ]; then
diff --git a/config/version.mk b/config/version.mk
index 6023a13b7cf27a4daddcb0847e3eb82d85d92c6c..27b59a49ccf268c65ba310cf43ba997b769d999c 100644
--- a/config/version.mk
+++ b/config/version.mk
@@ -2,6 +2,7 @@ ANDROID_LETTER := a16
 PRODUCT_VERSION_MAJOR = 3
 PRODUCT_VERSION_MINOR = 6
 PRODUCT_VERSION_MAINTENANCE := 0
+LINEAGE_UPSTREAM_VERSION := lineage-23.0
 PRODUCT_PRERELEASE_STRING =
 
 ifdef PRODUCT_PRERELEASE