diff --git a/playlist.json b/playlist.json
index 8c1980b..8fa4b5a 100644
--- a/playlist.json
+++ b/playlist.json
@@ -226,7 +226,7 @@
         "logo": "https://images.cdn.yle.fi/image/upload/ar_1:1,c_fill,f_auto,q_auto:eco,w_614/v0/13-57-1574340303647.png",
         "stream": {
             "default": "m3u8",
-            "m3u8": "https://yleradiolive.akamaized.net/hls/live/2027715/in-YlePori/master.m3u8"
+            "m3u8": "https://icecast.live.yle.fi/radio/YlePori/icecast.audio"
         }
     },
     {
@@ -235,7 +235,7 @@
         "logo": "https://images.cdn.yle.fi/image/upload/ar_1:1,c_fill,f_auto,q_auto:eco,w_614/v0/13-57-1574406855224.png",
         "stream": {
             "default": "m3u8",
-            "m3u8": "https://yleradiolive.akamaized.net/hls/live/2027674/in-YleX/master.m3u8"
+            "m3u8": "https://icecast.live.yle.fi/radio/YleX/icecast.audio"
         }
     },
     {
diff --git a/playlists/playlist.m3u b/playlists/playlist.m3u
index 2a83f93..b44e3ef 100644
--- a/playlists/playlist.m3u
+++ b/playlists/playlist.m3u
@@ -69,11 +69,11 @@ https://stream.bauermedia.fi/suomirock/suomirock_64.aac
 #EXTINF:-1,SuomiRäp
 https://stream.bauermedia.fi/basso/rap_64.aac
 
-#EXTINF:-1,YLE Satakunnan Radio
-https://yleuni-f.akamaihd.net/i/yleliveradiohd_23@113900/master.m3u8
+#EXTINF:-1,Yle Radio Suomi
+https://icecast.live.yle.fi/radio/YlePori/icecast.audio
 
-#EXTINF:-1,YLE X
-https://yleuni-f.akamaihd.net/i/yleliveradiohd_2@113879/master.m3u8
+#EXTINF:-1,YleX
+https://icecast.live.yle.fi/radio/YleX/icecast.audio
 
 #EXTINF:-1,Ysäri
 https://stream.bauermedia.fi/ysari/ysari_64.aac
\ No newline at end of file
diff --git a/playlists/playlist.pls b/playlists/playlist.pls
index a1d4165..0bac738 100644
--- a/playlists/playlist.pls
+++ b/playlists/playlist.pls
@@ -69,11 +69,11 @@ Title22=SuomiRock
 File23=https://stream.bauermedia.fi/basso/rap_64.aac
 Title23=SuomiRäp
 
-File24=https://yleuni-f.akamaihd.net/i/yleliveradiohd_23@113900/master.m3u8
-Title24=YLE Satakunnan Radio
+File24=https://icecast.live.yle.fi/radio/YlePori/icecast.audio
+Title24=Yle Radio Suomi
 
-File25=https://yleuni-f.akamaihd.net/i/yleliveradiohd_2@113879/master.m3u8
-Title25=YLE X
+File25=https://icecast.live.yle.fi/radio/YleX/icecast.audio
+Title25=YleX
 
 File26=https://stream.bauermedia.fi/ysari/ysari_64.aac
 Title26=Ysäri
diff --git a/playlists/playlist.xspf b/playlists/playlist.xspf
index e9ecb5c..0daccec 100644
--- a/playlists/playlist.xspf
+++ b/playlists/playlist.xspf
@@ -94,12 +94,12 @@
        <location>https://stream.bauermedia.fi/basso/rap_64.aac</location>
    </track>
    <track>
-       <title>YLE Satakunnan Radio</title>
-       <location>https://yleuni-f.akamaihd.net/i/yleliveradiohd_23@113900/master.m3u8</location>
+       <title>Yle Radio Suomi</title>
+       <location>https://icecast.live.yle.fi/radio/YlePori/icecast.audio</location>
    </track>
    <track>
-       <title>YLE X</title>
-       <location>https://yleuni-f.akamaihd.net/i/yleliveradiohd_2@113879/master.m3u8</location>
+       <title>YleX</title>
+       <location>https://icecast.live.yle.fi/radio/YleX/icecast.audio</location>
    </track>
    <track>
        <title>Ysäri</title>