diff --git a/metadata/de.geeksfactory.opacclient.txt b/metadata/de.geeksfactory.opacclient.txt
index bdda0abefc..ec3b7202a9 100644
--- a/metadata/de.geeksfactory.opacclient.txt
+++ b/metadata/de.geeksfactory.opacclient.txt
@@ -923,18 +923,18 @@ Build:5.0.3,161
     build=gradle downloadJson && \
         mv opacapp/src/main/assets src/main/
 
-Maintainer Notes:
-downloadJson needs to be run before build, but outputs to opacapp/opacapp.
-Wait until fixed in upstream, remove workaround and reinstate
-
-preassemble=downloadJson
-
-and
+Build:5.0.4,162
+    commit=5.0.4
+    subdir=opacclient/opacapp
+    submodules=yes
+    gradle=yes
+    prebuild=echo 'repositories { maven { url "https://s3.amazonaws.com/repo.commonsware.com" } }' >> build.gradle && \
+        sed -i -e '/endless/d' -e '/adapter/d' build.gradle && \
+        sed -i -e '/support-v4/acompile "com.commonsware.cwac:endless:1.2.3"' build.gradle && \
+        sed -i -e '/support-v4/acompile "com.commonsware.cwac:adapter:1.0.1"' build.gradle
+    preassemble=downloadJson
 
 Auto Update Mode:Version %v
-.
-
-Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:5.0.4
 Current Version Code:162