diff --git a/app/build.gradle b/app/build.gradle
index f3054a3d5..10d1e1272 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,8 +3,10 @@
  *
  * @author Mario Danic
  * @author Andy Scherzinger
+ * @author Marcel Hibbe
  * Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
  * Copyright (C) 2017-2019 Mario Danic <mario@lovelyhq.com>
+ * Copyright (C) 2021 Marcel Hibbe <dev@mhibbe.de>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -238,15 +240,15 @@ dependencies {
     implementation 'org.apache.commons:commons-lang3:3.12.0'
     implementation 'com.github.wooplr:Spotlight:1.3'
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
-    implementation('com.github.mario:chatkit:c6a61767291ddb212a2f4f792a2b6aaf295e69a5', {
+    implementation('com.github.mahibi:ChatKit:master-SNAPSHOT', {
         exclude group: 'com.facebook.fresco'
     })
 
-    implementation 'com.github.mario.fresco:fresco:111'
-    implementation 'com.github.mario.fresco:animated-webp:111'
-    implementation 'com.github.mario.fresco:webpsupport:111'
-    implementation 'com.github.mario.fresco:animated-gif:111'
-    implementation 'com.github.mario.fresco:imagepipeline-okhttp3:111'
+    implementation 'com.github.mahibi.fresco:fresco:111'
+    implementation 'com.github.mahibi.fresco:animated-webp:111'
+    implementation 'com.github.mahibi.fresco:webpsupport:111'
+    implementation 'com.github.mahibi.fresco:animated-gif:111'
+    implementation 'com.github.mahibi.fresco:imagepipeline-okhttp3:111'
     implementation 'joda-time:joda-time:2.10.10'
     implementation "io.coil-kt:coil:${coilKtVersion}"
     implementation "io.coil-kt:coil-gif:${coilKtVersion}"
@@ -258,7 +260,7 @@ dependencies {
     implementation 'com.novoda:merlin:1.2.1'
 
     implementation 'com.github.Kennyc1012:BottomSheet:2.4.1'
-    implementation 'com.github.mario:PopupBubble:a365177d96'
+    implementation 'com.github.mahibi:PopupBubble:master-SNAPSHOT'
     implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
     implementation 'eu.medsea.mimeutil:mime-util:2.1.3'