diff --git a/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml b/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml
index acbdb2b97..6bdca9205 100644
--- a/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml
+++ b/plugin-dev/Source/Sentry/Sentry_Android_UPL.xml
@@ -34,14 +34,14 @@
             <true>
                 <copyFile src="$S(ProjectDir)/sentry.properties" dst="$S(BuildDir)/gradle/sentry.properties" />
                 <copyFile src="$S(ProjectDir)/sentry.properties" dst="$S(BuildDir)/gradle/AFSProject/app/sentry.properties" />
-                <if condition="bUseLegacyGradlePlugin">
-                    <false>
-                        <log text="Modifying engine's Gradle version used by replacing gradle-wrapper.properties"/>
-                        <copyFile src="$S(PluginDir)/../../Gradle/gradle-wrapper.properties" dst="$S(BuildDir)/gradle/gradle/wrapper/gradle-wrapper.properties" />
-                    </false>
-                </if>
             </true>
         </if>
+        <if condition="bUseLegacyGradlePlugin">
+            <false>
+                <log text="Modifying engine's Gradle version used by replacing gradle-wrapper.properties"/>
+                <copyFile src="$S(PluginDir)/../../Gradle/gradle-wrapper.properties" dst="$S(BuildDir)/gradle/gradle/wrapper/gradle-wrapper.properties" />
+            </false>
+        </if>
     </prebuildCopies>
 
     <androidManifestUpdates>
@@ -56,6 +56,7 @@
         <insert>
             android.useAndroidX=true
             android.enableJetifier=true
+            android.jetifier.ignorelist=epitaph
         </insert>
     </gradleProperties>
 
@@ -109,11 +110,14 @@
                     targetCompatibility JavaVersion.VERSION_1_8
                     sourceCompatibility JavaVersion.VERSION_1_8
                 }
+                buildFeatures {
+                    aidl true
+                }
             }
 
             dependencies {
                 implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'])
-                implementation "com.google.protobuf:protobuf-javalite:3.25.8"
+                implementation "com.abovevacant:epitaph:0.1.0"
             }
 
             repositories {
@@ -155,6 +159,22 @@
     </baseBuildGradleAdditions>
 
     <buildscriptGradleAdditions>
+        <if condition="bUseLegacyGradlePlugin">
+            <true>
+                <insert>
+                    dependencies {
+                        classpath 'com.android.tools.build:gradle:3.5.4'
+                    }
+                </insert>
+            </true>
+            <false>
+                <insert>
+                    dependencies {
+                        classpath 'com.android.tools.build:gradle:7.4.2'
+                    }
+                </insert>
+            </false>
+        </if>
         <if condition="bUploadSymbols">
             <true>
                 <if condition="bUseLegacyGradlePlugin">
@@ -162,17 +182,14 @@
                         <log text="Using legacy Sentry Gradle plugin for Android debug symbol upload."/>
                         <insert>
                             dependencies {
-                                classpath 'com.android.tools.build:gradle:3.5.4'
                                 classpath 'io.sentry:sentry-android-gradle-plugin:2.1.5' // legacy
                             }
                         </insert>
                     </true>
                     <false>
                         <log text="Using Sentry Gradle plugin for Android debug symbol upload."/>
-                        <log text="Enable legacy Sentry Gradle plugin in project settings in case current version conflicts with other plugins (for UE 5.4 and older)."/>
                         <insert>
                             dependencies {
-                                classpath 'com.android.tools.build:gradle:7.4.2'
                                 classpath 'io.sentry:sentry-android-gradle-plugin:6.1.0' // current
                             }
                         </insert>