diff --git a/gradle.properties b/gradle.properties
index e2c4770f..5fc57f04 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,5 +21,5 @@ android.nonFinalResIds=true
 org.gradle.unsafe.configuration-cache=true
 
 # TODO Renable on day (check that Retrofit, Jackson, and Imageloader are working)
-android.enableR8.fullMode=false
+android.enableR8.fullMode=true
 
diff --git a/ultrasonic/minify/proguard-jackson.pro b/ultrasonic/minify/proguard-jackson.pro
index 865b1091..d154a877 100644
--- a/ultrasonic/minify/proguard-jackson.pro
+++ b/ultrasonic/minify/proguard-jackson.pro
@@ -1,5 +1,4 @@
 #### From Jackson
-
 -keepattributes *Annotation*,EnclosingMethod,Signature
 -keepnames class com.fasterxml.jackson.** {
 *;
diff --git a/ultrasonic/minify/proguard-main.pro b/ultrasonic/minify/proguard-main.pro
index 83df2458..dda62679 100644
--- a/ultrasonic/minify/proguard-main.pro
+++ b/ultrasonic/minify/proguard-main.pro
@@ -1,8 +1,14 @@
 -dontobfuscate
 
 ### Don't remove subsonic api serializers/entities
--keep class org.moire.ultrasonic.api.subsonic.response.** { *; }
--keep class org.moire.ultrasonic.api.subsonic.models.** { *; }
+-keep class org.moire.ultrasonic.api.subsonic.** { *; }
+
+## Don't remove the domain models
+-keep class org.moire.ultrasonic.domain.** { *; }
+
+## Don't remove the imageloader
+-keep class org.moire.ultrasonic.imageloader.** { *; }
+-keep class org.moire.ultrasonic.provider.AlbumArtContentProvider { *; }
 
 ## Don't remove NowPlayingFragment
 -keep class org.moire.ultrasonic.fragment.NowPlayingFragment { *; }