diff --git a/www/caddy/Makefile b/www/caddy/Makefile
index f5a01d871..4264cd9b0 100644
--- a/www/caddy/Makefile
+++ b/www/caddy/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		caddy
-PLUGIN_VERSION=		1.7.6
+PLUGIN_VERSION=		1.8.0
 PLUGIN_DEPENDS=		caddy-custom
 PLUGIN_COMMENT=		Modern Reverse Proxy with Automatic HTTPS, Dynamic DNS and Layer4 Routing
 PLUGIN_MAINTAINER=	cedrik@pischem.com
diff --git a/www/caddy/pkg-descr b/www/caddy/pkg-descr
index 2ec24cd5e..f7217f7f6 100644
--- a/www/caddy/pkg-descr
+++ b/www/caddy/pkg-descr
@@ -13,6 +13,16 @@ DOC: https://docs.opnsense.org/manual/how-tos/caddy.html
 Plugin Changelog
 ================
 
+1.8.0
+
+* Build: Update to caddy-v2.9.0 and update dependencies (opnsense/plugins/issues/4437)
+* Build: Fix caddy-l4 timeout issue (opnsense/plugins/issues/4384)
+* Build: Mark DNS Providers optional that are not included per default (opnsense/plugins/pull/4441)
+         digitalocean, route53, googleclouddns, netlify, ddnss, njalla, tencentcloud
+         dinahosting, civo, easydns, hosttech; must be added via https://caddyserver.com/docs/command-line#caddy-add-package
+* Cleanup: Refactor caddy.inc and add syslog function, change name from Caddy Web Server to Caddy (opnsense/plugins/issues/4426)
+* Cleanup: Some small UI tweaks (opnsense/plugins/pull/4442)
+
 1.7.6
 
 * Fix: Web UI can still restart/stop Caddy when running as `www` user (opnsense/plugins/pull/4403)
diff --git a/www/caddy/src/etc/inc/plugins.inc.d/caddy.inc b/www/caddy/src/etc/inc/plugins.inc.d/caddy.inc
index 78da119b7..5e116933a 100644
--- a/www/caddy/src/etc/inc/plugins.inc.d/caddy.inc
+++ b/www/caddy/src/etc/inc/plugins.inc.d/caddy.inc
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (C) 2023-2024 Cedrik Pischem
+ * Copyright (C) 2023-2025 Cedrik Pischem
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@ function caddy_services()
         $config['Pischem']['caddy']['general']['enabled'] == 1
     ) {
         $services[] = array(
-            'description' => gettext('Caddy Web Server'),
+            'description' => gettext('Caddy'),
             'configd' => array(
                 'restart' => array('caddy restart'),
                 'start' => array('caddy start'),
@@ -56,7 +56,7 @@ function caddy_xmlrpc_sync()
     $result = array();
 
     $result[] = array(
-        'description' => gettext('Caddy Web Server'),
+        'description' => gettext('Caddy'),
         'section' => 'Pischem.caddy',
         'id' => 'caddy',
         'services' => ["caddy"],
@@ -64,3 +64,8 @@ function caddy_xmlrpc_sync()
 
     return $result;
 }
+
+function caddy_syslog()
+{
+    return ['caddy' => ['facility' => ['caddy']]];
+}
diff --git a/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Menu/Menu.xml b/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Menu/Menu.xml
index 0a992a746..421560b53 100644
--- a/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Menu/Menu.xml
+++ b/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Menu/Menu.xml
@@ -1,6 +1,6 @@
 <menu>
     <Services>
-        <Caddy VisibleName="Caddy Web Server" cssClass="fa fa-globe fa-fw">
+        <Caddy cssClass="fa fa-globe fa-fw">
             <General VisibleName="General Settings" order="10" url="/ui/caddy/general"/>
             <ReverseProxy VisibleName="Reverse Proxy" order="20" url="/ui/caddy/reverse_proxy"/>
             <Layer4 VisibleName="Layer4 Proxy" order="30" url="/ui/caddy/layer4"/>