diff --git a/terraform/apps/prod-01/config.tf b/terraform/apps/prod-01/config.tf
index 51e63db..e1df8a2 100644
--- a/terraform/apps/prod-01/config.tf
+++ b/terraform/apps/prod-01/config.tf
@@ -18,7 +18,7 @@ locals {
   }
 
   # gitea
-  gitea_version = "1.24-rootless"
+  gitea_version = "1.25-rootless"
   gitea_fqdn    = "code.${local.primary_domain}"
 
   # sftpgo
diff --git a/terraform/modules/apps/gitea/config.tf b/terraform/modules/apps/gitea/config.tf
index f6be7e7..3440cb4 100644
--- a/terraform/modules/apps/gitea/config.tf
+++ b/terraform/modules/apps/gitea/config.tf
@@ -34,6 +34,7 @@ locals {
     SMTP_PROTOCOL                    = var.app_config.smtp_protocol
     SMTP_HOST                        = var.app_config.smtp_host
     SMTP_PORT                        = var.app_config.smtp_port
+    SSH_SERVER_KEY_EXCHANGES         = "mlkem768x25519-sha256"
   })
   config_checksum = sha256(local.config)
 }
diff --git a/terraform/modules/apps/gitea/resources/app.ini.tpl b/terraform/modules/apps/gitea/resources/app.ini.tpl
index 5fe7c79..ad5c0ca 100644
--- a/terraform/modules/apps/gitea/resources/app.ini.tpl
+++ b/terraform/modules/apps/gitea/resources/app.ini.tpl
@@ -35,6 +35,7 @@ LFS_JWT_SECRET   = ${LFS_JWT_SECRET}
 DOMAIN           = ${DOMAIN}
 OFFLINE_MODE     = false
 SHELL = /bin/sh
+SSH_SERVER_KEY_EXCHANGES=${SSH_SERVER_KEY_EXCHANGES}
 
 [lfs]
 PATH = /data/git/lfs
diff --git a/terraform/modules/apps/gitea/variables.tf b/terraform/modules/apps/gitea/variables.tf
index bc06f9c..d43e461 100644
--- a/terraform/modules/apps/gitea/variables.tf
+++ b/terraform/modules/apps/gitea/variables.tf
@@ -32,7 +32,7 @@ variable "db_root_password" {
 variable "tag" {
   description = "The version of the websites to install"
   type        = string
-  default     = "latest-rootless"
+  default     = "1.25-rootless"
 }
 
 variable "fqdn" {
diff --git a/terraform/modules/apps/m3uproxy/resources/m3uproxy/playlist.json b/terraform/modules/apps/m3uproxy/resources/m3uproxy/playlist.json
index 6084e34..a8b8687 100644
--- a/terraform/modules/apps/m3uproxy/resources/m3uproxy/playlist.json
+++ b/terraform/modules/apps/m3uproxy/resources/m3uproxy/playlist.json
@@ -10,59 +10,10 @@
                 "group-title": "Beachcam",
                 "radio": "true"
             }
-        },
-        "iptv_be": {
-            "provider": "file",
-            "config": {
-                "source": "https://raw.githubusercontent.com/iptv-org/iptv/master/streams/be.m3u"
-            }
-        },
-        "iptv_nl": {
-            "provider": "file",
-            "config": {
-                "source": "https://raw.githubusercontent.com/iptv-org/iptv/master/streams/nl.m3u"
-            }
-        },
-        "iptv_pt_samsung": {
-            "provider": "file",
-            "config": {
-                "source": "https://raw.githubusercontent.com/iptv-org/iptv/master/streams/pt_samsung.m3u"
-            }
-        },
-        "iptv_nl_samsung": {
-            "provider": "file",
-            "config": {
-                "source": "https://raw.githubusercontent.com/iptv-org/iptv/master/streams/nl_samsung.m3u"
-            }
-        },
-        "iptv_uk_rakuten": {
-            "provider": "file",
-            "config": {
-                "source": "https://raw.githubusercontent.com/iptv-org/iptv/master/streams/uk_rakuten.m3u"
-            }
-        },
-        "iptv_uk_samsung": {
-            "provider": "file",
-            "config": {
-                "source": "https://raw.githubusercontent.com/iptv-org/iptv/master/streams/uk_samsung.m3u"
-            }
-        },
-        "iptv_us_pluto": {
-            "provider": "file",
-            "config": {
-                "source": "https://raw.githubusercontent.com/iptv-org/iptv/master/streams/us_pluto.m3u"
-            }
         }
     },
     "providers_priority": [
-        "m3upt",
-        "iptv_be",
-        "iptv_nl",
-        "iptv_nl_samsung",
-        "iptv_pt_samsung",
-        "iptv_uk_rakuten",
-        "iptv_uk_samsung",
-        "iptv_us_pluto"
+        "m3upt"
     ],
     "overrides": {
         "RTP1.pt": {