diff --git a/src/en/aniplay/build.gradle b/src/en/aniplay/build.gradle
index edce2f4c..6c61774b 100644
--- a/src/en/aniplay/build.gradle
+++ b/src/en/aniplay/build.gradle
@@ -2,7 +2,7 @@ ext {
     extName = 'AniPlay'
     extClass = '.AniPlay'
     themePkg = 'anilist'
-    overrideVersionCode = 15
+    overrideVersionCode = 17
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/aniplay/src/eu/kanade/tachiyomi/animeextension/en/aniplay/AniPlay.kt b/src/en/aniplay/src/eu/kanade/tachiyomi/animeextension/en/aniplay/AniPlay.kt
index e23034ec..d67d4714 100644
--- a/src/en/aniplay/src/eu/kanade/tachiyomi/animeextension/en/aniplay/AniPlay.kt
+++ b/src/en/aniplay/src/eu/kanade/tachiyomi/animeextension/en/aniplay/AniPlay.kt
@@ -30,7 +30,9 @@ import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.io.IOException
 import java.text.SimpleDateFormat
+import java.util.Date
 import java.util.Locale
+import java.util.concurrent.locks.ReentrantLock
 
 @Suppress("unused")
 class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
@@ -244,9 +246,9 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
         val response = client.newCall(request).execute()
 
         val responseString = response.body.string()
-        val sourcesString = extractSourcesList(responseString) ?: return emptyList()
-        Log.i("AniPlay", "${extra.source} $language -> $sourcesString")
         try {
+            val sourcesString = extractSourcesList(responseString) ?: throw Exception("extractSourcesList null")
+            Log.i("AniPlay", "${extra.source} $language -> $sourcesString")
             return processEpisodeData(
                 EpisodeData(
                     source = extra.source,
@@ -260,14 +262,6 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
         }
     }
 
-    private fun getProxiedUrl(originalUrl: String, serverName: String, referer: String?): String {
-        return when (serverName) {
-            "Yuki" -> "$PROXY_URL/yukiprox?url=$originalUrl"
-            "Pahe" -> "$PROXY_URL/fetch?url=$originalUrl?ref=$referer"
-            else -> return originalUrl
-        }
-    }
-
     private fun processEpisodeData(episodeData: EpisodeData): List<Video> {
         val defaultSource = episodeData.response.sources?.firstOrNull {
             it.quality in listOf("default", "auto")
@@ -290,19 +284,44 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
         }
 
         try {
-            val url = getProxiedUrl(defaultSource.url, serverName, episodeData.response.headers?.Referer)
-            return playlistUtils.extractFromHls(
-                playlistUrl = url,
-                videoNameGen = { quality -> "$serverName - $quality - $typeName" },
-                subtitleList = subtitles,
-                masterHeadersGen = { baseHeaders: Headers, _: String ->
-                    baseHeaders.newBuilder().apply {
+            when (serverName) {
+                // yuki
+                PREF_SERVER_ENTRIES[1] -> {
+                    val url = "https://yukiprox.aniplaynow.live/m3u8-proxy?url=${defaultSource.url}&headers={\"Referer\":\"https://megacloud.club/\"}"
+                    return playlistUtils.extractFromHls(
+                        playlistUrl = url,
+                        videoNameGen = { quality -> "$serverName - $quality - $typeName" },
+                        subtitleList = subtitles,
+                        masterHeadersGen = { baseHeaders: Headers, _: String ->
+                            baseHeaders.newBuilder().apply {
+                                set("Accept", "*/*")
+                                set("Origin", baseUrl)
+                                set("Referer", "$baseUrl/")
+                            }.build()
+                        },
+                        videoHeadersGen = { baseHeaders: Headers, _, _: String ->
+                            baseHeaders.newBuilder().apply {
+                                set("Accept", "*/*")
+                                set("Origin", baseUrl)
+                                set("Referer", "$baseUrl/")
+                            }.build()
+                        },
+                    )
+                }
+                // pahe
+                PREF_SERVER_ENTRIES[2] -> {
+                    val url = "https://prox.aniplaynow.live/?url=${defaultSource.url}&ref=https://kwik.si"
+                    val headers = headers.newBuilder().apply {
                         set("Accept", "*/*")
                         set("Origin", baseUrl)
                         set("Referer", "$baseUrl/")
                     }.build()
-                },
-            )
+                    return listOf(Video(url, "$serverName - Video - $typeName", url, headers, subtitles, listOf()))
+                }
+                else -> {
+                    throw Exception("Unknown serverName: $serverName (${episodeData.source})")
+                }
+            }
         } catch (e: Exception) {
             Log.e("AniPlay", "processEpisodeData extractFromHls Error (\"$serverName - $typeName\"): $e")
         }
@@ -358,6 +377,60 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
         return if (bracketCount == 0) input.substring(startIndex - 1, endIndex) else null
     }
 
+    private val headerFetchLock = ReentrantLock()
+    private var lastHeaderFetch = 0L
+    private fun fetchHeaders() {
+        val internalFetchHeaders = internalFetchHeaders@{
+            val currentTimestamp = Date().time
+            val timeout = lastHeaderFetch + (HEADERS_TIMEOUT_MINUTES * 60 * 1000)
+            // check only after 15 minutes
+            if (timeout > currentTimestamp) {
+                Log.i("AniPlay", "Skipping header update. $timeout > $currentTimestamp (${timeout - currentTimestamp}).")
+                return@internalFetchHeaders
+            }
+
+            val baseUrl = Base64.decode("aHR0cHM6Ly9qb3NlZmZzdHJha2EuZ2l0aHViLmlvL2FuaXBsYXktaGVhZGVycy8=", Base64.DEFAULT).toString(Charsets.UTF_8)
+
+            val preferredDomain = preferences.getString(PREF_DOMAIN_KEY, PREF_DOMAIN_DEFAULT)!!
+
+            try {
+                val url = ("$baseUrl$preferredDomain/headers.json").toHttpUrl()
+                val response = client.newCall(Request(url)).execute()
+                val body = response.body.string()
+                val domainHeaders = body.parseAs<DomainHeaders>()
+                domainsHeaders[preferredDomain] = domainHeaders
+                Log.i("AniPlay", "Fetched headers($preferredDomain): $domainHeaders")
+            } catch (e: Exception) {
+                Log.e("AniPlay", "Failed to fetch new headers: \"e\"")
+                return@internalFetchHeaders
+            }
+
+            lastHeaderFetch = Date().time
+        }
+
+        headerFetchLock.lock()
+        try {
+            internalFetchHeaders()
+        } finally {
+            headerFetchLock.unlock()
+        }
+    }
+
+    private fun getHeaderValue(serverHost: String, key: String): String {
+        fetchHeaders()
+        try {
+            val domainHeaders = domainsHeaders[serverHost] ?: throw Exception("Bad host: $serverHost")
+            return when (key) {
+                NEXT_ACTION_EPISODE_LIST -> domainHeaders.episodes
+                NEXT_ACTION_SOURCES_LIST -> domainHeaders.sources
+                else -> throw Exception("Bad key: $key")
+            }
+        } catch (e: Exception) {
+            Log.e("AniPlay", "getHeaderValue error. $e. (s:${domainsHeaders.size}, l:$lastHeaderFetch)")
+            throw e
+        }
+    }
+
     /* ====================================== Preferences ====================================== */
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
@@ -485,10 +558,6 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
         } ?: 0L
     }
 
-    private fun getHeaderValue(serverHost: String, key: String): String {
-        return HEADER_NEXT_ACTION[serverHost]?.get(key) ?: throw Exception("Bad host/key")
-    }
-
     companion object {
         private const val PREF_DOMAIN_KEY = "domain"
         private val PREF_DOMAIN_ENTRIES = arrayOf("aniplaynow.live (default)", "aniplay.lol (backup/experimental)")
@@ -524,18 +593,10 @@ class AniPlay : AniListAnimeHttpSource(), ConfigurableAnimeSource {
         private const val NEXT_ACTION_EPISODE_LIST = "NEXT_ACTION_EPISODE_LIST"
         private const val NEXT_ACTION_SOURCES_LIST = "NEXT_ACTION_SOURCES_LIST"
 
-        private val HEADER_NEXT_ACTION = mapOf(
-            PREF_DOMAIN_ENTRY_VALUES[0] to mapOf(
-                "NEXT_ACTION_EPISODE_LIST" to "7f07777b5f74e3edb312e0b718a560f9d3ad21aeba",
-                "NEXT_ACTION_SOURCES_LIST" to "7f11490e43dca1ed90fcb5b90bac1e5714a3e11232",
-            ),
-            PREF_DOMAIN_ENTRY_VALUES[1] to mapOf(
-                "NEXT_ACTION_EPISODE_LIST" to "7f57233b7a6486e8211b883c502fa0450775f0ee98",
-                "NEXT_ACTION_SOURCES_LIST" to "7f48c7ffeb25edece852102a65d794a1dffa37aaac",
-            ),
-        )
-        private const val PROXY_URL = "https://prox.aniplaynow.live"
+        private const val HEADERS_TIMEOUT_MINUTES = 60
 
         private val DATE_FORMATTER = SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH)
+
+        private var domainsHeaders = mutableMapOf<String, DomainHeaders>()
     }
 }
diff --git a/src/en/aniplay/src/eu/kanade/tachiyomi/animeextension/en/aniplay/AniPlayDto.kt b/src/en/aniplay/src/eu/kanade/tachiyomi/animeextension/en/aniplay/AniPlayDto.kt
index 4f909466..b6ba3e80 100644
--- a/src/en/aniplay/src/eu/kanade/tachiyomi/animeextension/en/aniplay/AniPlayDto.kt
+++ b/src/en/aniplay/src/eu/kanade/tachiyomi/animeextension/en/aniplay/AniPlayDto.kt
@@ -79,3 +79,11 @@ data class EpisodeExtra(
     val episodeId: String,
     val hasDub: Boolean,
 )
+
+// Headers
+@Serializable
+data class DomainHeaders(
+    val episodes: String,
+    val sources: String,
+    val time: Long,
+)