diff --git a/Moto/G8/Android.mk b/Moto/G8/Android.mk
new file mode 100644
index 0000000..daefbeb
--- /dev/null
+++ b/Moto/G8/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-moto-g8
+LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
+LOCAL_PRIVATE_PLATFORM_APIS := true
+include $(BUILD_PACKAGE)
diff --git a/Moto/G8/AndroidManifest.xml b/Moto/G8/AndroidManifest.xml
new file mode 100644
index 0000000..6503ce5
--- /dev/null
+++ b/Moto/G8/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.moto.g8"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="android"
+                android:requiredSystemPropertyName="ro.vendor.build.fingerprint"
+                android:requiredSystemPropertyValue="+*otorola/rav*"
+		android:priority="161"
+		android:isStatic="true" />
+</manifest>
diff --git a/Moto/G8/res/values/config.xml b/Moto/G8/res/values/config.xml
new file mode 100644
index 0000000..c3f7f9c
--- /dev/null
+++ b/Moto/G8/res/values/config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="config_useDevInputEventForAudioJack">true</bool>
+    <bool name="config_showNavigationBar">true</bool>
+
+    <dimen name="status_bar_height_portrait">71.0px</dimen>
+    <dimen name="status_bar_height_landscape">28dp</dimen>
+
+    <integer name="config_screenBrightnessDark">1</integer>
+    <integer name="config_screenBrightnessDim">2</integer>
+    <integer name="config_screenBrightnessSettingMinimum">1</integer>
+    <integer name="config_screenBrightnessSettingDefault">99</integer>
+
+    <!--
+    For some reason, the cutout defined by the vendor overlay isn't fully working
+    Issue is that SystemUI doesn't respect the punch-hole in portrait mode
+    <string name="config_mainBuiltInDisplayCutout">M -325,0 L -276,0 L -276,68 L -325,68 Z</string>
+    The workaround is to modify the cutout definition, so that its left edge extends to the edge of the display
+     -->
+    <string name="config_mainBuiltInDisplayCutout">M -360,0 L -276,0 L -276,68 L -360,68 Z</string>
+</resources>
diff --git a/Moto/G8/res/xml/power_profile.xml b/Moto/G8/res/xml/power_profile.xml
new file mode 100644
index 0000000..64a70c5
--- /dev/null
+++ b/Moto/G8/res/xml/power_profile.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<device name="Android">
+    <item name="none">0</item>
+    <item name="screen.on">80.461</item>
+    <item name="screen.full">386.775</item>
+    <item name="wifi.on">0.597</item>
+    <item name="wifi.active">41.623</item>
+    <item name="wifi.scan">65.088</item>
+    <item name="camera.avg">445.836</item>
+    <item name="camera.flashlight">108.367</item>
+    <item name="gps.on">57.904</item>
+    <item name="radio.active">208.332</item>
+    <item name="radio.scanning">46.310</item>
+    <array name="radio.on">
+        <value>33.079</value>
+        <value>30</value>
+        <value>25</value>
+        <value>20</value>
+        <value>15</value>
+        <value>10</value>
+        <value>5</value>
+        <value>1.090</value>
+    </array>
+    <array name="cpu.clusters.cores">
+        <value>4</value>
+        <value>4</value>
+    </array>
+    <array name="cpu.core_speeds.cluster0">
+        <value>300000</value>
+        <value>614400</value>
+        <value>864000</value>
+        <value>1017600</value>
+        <value>1305600</value>
+        <value>1420800</value>
+        <value>1612800</value>
+        <value>1804800</value>
+    </array>
+    <array name="cpu.core_speeds.cluster1">
+        <value>300000</value>
+        <value>652800</value>
+        <value>902400</value>
+        <value>1056000</value>
+        <value>1401600</value>
+        <value>1536000</value>
+        <value>1804800</value>
+        <value>2016000</value>
+    </array>
+    <array name="cpu.core_power.cluster0">
+        <value>0.8</value>
+        <value>3.7</value>
+        <value>6.9</value>
+        <value>9.8</value>
+        <value>17.8</value>
+        <value>22.8</value>
+        <value>39.9</value>
+        <value>52.6</value>
+    </array>
+    <array name="cpu.core_power.cluster1">
+        <value>1.1</value>
+        <value>11.4</value>
+        <value>53.8</value>
+        <value>66.4</value>
+        <value>99.5</value>
+        <value>111.6</value>
+        <value>121.0</value>
+        <value>157.5</value>
+    </array>
+    <item name="cpu.cluster_power.cluster0">17.8</item>
+    <item name="cpu.cluster_power.cluster1">26.6</item>
+    <item name="cpu.suspend">5.859</item>
+    <item name="cpu.idle">6.505</item>
+    <item name="cpu.active">3</item>
+    <item name="battery.capacity">4000</item>
+</device>
\ No newline at end of file
diff --git a/overlay.mk b/overlay.mk
index 7c4e2dd..93ab502 100755
--- a/overlay.mk
+++ b/overlay.mk
@@ -59,6 +59,7 @@ PRODUCT_PACKAGES += \
 	treble-overlay-moto-g6plus \
 	treble-overlay-moto-g7play \
 	treble-overlay-moto-g7power \
+	treble-overlay-moto-g8 \
 	treble-overlay-moto-g8plus \
 	treble-overlay-moto-g8power \
 	treble-overlay-moto-one \