diff --git a/app/functions/eventpanel.gradle b/app/functions/eventpanel.gradle
index af40aafa69..8fd4d2cacf 100644
--- a/app/functions/eventpanel.gradle
+++ b/app/functions/eventpanel.gradle
@@ -2,24 +2,24 @@
 
 project.dependencies {
     if (Boolean.valueOf(RELEASE)) {
+        d8xxImplementation rootProject.ext.dependencies.moduleventpanel
+
         d82xImplementation rootProject.ext.dependencies.moduleventpanelnoop
         em1Implementation rootProject.ext.dependencies.moduleventpanelnoop
         bydautoImplementation rootProject.ext.dependencies.moduleventpanelnoop
-
-        d8xxImplementation rootProject.ext.dependencies.moduleventpanel
-        em4Implementation rootProject.ext.dependencies.moduleventpanel
-        e8xxImplementation rootProject.ext.dependencies.moduleventpanel
-        f8xxImplementation rootProject.ext.dependencies.moduleventpanel
-        em3Implementation rootProject.ext.dependencies.moduleventpanel
+        em4Implementation rootProject.ext.dependencies.moduleventpanelnoop
+        e8xxImplementation rootProject.ext.dependencies.moduleventpanelnoop
+        f8xxImplementation rootProject.ext.dependencies.moduleventpanelnoop
+        em3Implementation rootProject.ext.dependencies.moduleventpanelnoop
     } else {
+        d8xxImplementation project(':modules:mogo-module-event-panel')
+
         d82xImplementation project(':modules:mogo-module-event-panel-noop')
         em1Implementation project(':modules:mogo-module-event-panel-noop')
         bydautoImplementation project(':modules:mogo-module-event-panel-noop')
-
-        d8xxImplementation project(':modules:mogo-module-event-panel')
-        em4Implementation project(':modules:mogo-module-event-panel')
-        e8xxImplementation project(':modules:mogo-module-event-panel')
-        f8xxImplementation project(':modules:mogo-module-event-panel')
-        em3Implementation project(':modules:mogo-module-event-panel')
+        em4Implementation project(':modules:mogo-module-event-panel-noop')
+        e8xxImplementation project(':modules:mogo-module-event-panel-noop')
+        f8xxImplementation project(':modules:mogo-module-event-panel-noop')
+        em3Implementation project(':modules:mogo-module-event-panel-noop')
     }
 }
\ No newline at end of file