diff --git a/config/common.mk b/config/common.mk
index fcd748dce31fb39715e17dbdc9e752eeee366a3f..629522cda4c95dc2c51b765cd9bd0eafce40a832 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -121,6 +121,34 @@ PRODUCT_MINIMIZE_JAVA_DEBUG_INFO := true
 PRODUCT_PACKAGES += \
     bootanimation.zip
 
+# Required /e/ packages
+PRODUCT_PACKAGES += \
+    GmsCore \
+		GsfProxy \
+		FakeStore \
+		com.google.android.maps.jar \
+		Mail \
+		BlissLauncher \
+		BlissIconPack \
+		MozillaNlpBackend \
+		OpenWeatherMapWeatherProvider \
+		AccountManager \
+		MagicEarth \
+		PdfViewer \
+		Camera \
+		eDrive \
+		Weather \
+		Notes \
+		Tasks \
+		NominatimNlpBackend \
+		DroidGuard \
+		LibreOfficeViewer \
+		OpenKeychain \
+		Message \
+		Browser \
+		BrowserWebView \
+		Apps
+
 # Required Lineage packages
 PRODUCT_PACKAGES += \
     LineageParts \
@@ -183,6 +211,11 @@ PRODUCT_PACKAGES += \
     wget \
     zip
 
+# Custom packages
+ifdef CUSTOM_PACKAGES
+PRODUCT_PACKAGES += $(CUSTOM_PACKAGES)
+endif
+
 # Charger
 PRODUCT_PACKAGES += \
     charger_res_images
@@ -241,6 +274,8 @@ PRODUCT_PACKAGES += \
 endif
 endif
 
+PRODUCT_PACKAGE_OVERLAYS := vendor/lineage/overlay/microg
+
 DEVICE_PACKAGE_OVERLAYS += vendor/lineage/overlay/common
 
 PRODUCT_VERSION_MAJOR = 0
@@ -263,11 +298,6 @@ ifndef LINEAGE_BUILDTYPE
     endif
 endif
 
-# Filter out random types, so it'll reset to UNOFFICIAL
-ifeq ($(filter RELEASE NIGHTLY SNAPSHOT EXPERIMENTAL,$(LINEAGE_BUILDTYPE)),)
-    LINEAGE_BUILDTYPE :=
-endif
-
 ifdef LINEAGE_BUILDTYPE
     ifneq ($(LINEAGE_BUILDTYPE), SNAPSHOT)
         ifdef LINEAGE_EXTRAVERSION
diff --git a/overlay/microg/frameworks/base/core/res/res/values/config.xml b/overlay/microg/frameworks/base/core/res/res/values/config.xml
new file mode 100644
index 0000000000000000000000000000000000000000..59252771c7f23dbc651e5244fa7a42a41c82797b
--- /dev/null
+++ b/overlay/microg/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Copyright (c) 2012-2016, The Linux Foundation. All rights reserved
+
+    Not a Contribution.
+
+    Licensed under the Apache License, Version 2.0 (the "License"); you
+    may not use this file except in compliance with the License.  You may
+    obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+    implied.  See the License for the specific language governing
+    permissions and limitations under the License.
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Force-enable the location overlays -->
+    <bool name="config_enableNetworkLocationOverlay" translatable="false">true</bool>
+    <bool name="config_enableFusedLocationOverlay" translatable="false">true</bool>
+
+</resources>