diff --git a/bin/ncp/SYSTEM/metrics.sh b/bin/ncp/SYSTEM/metrics.sh
index 5fd6b3c0..33903e10 100644
--- a/bin/ncp/SYSTEM/metrics.sh
+++ b/bin/ncp/SYSTEM/metrics.sh
@@ -48,7 +48,7 @@ metrics_services() {
 
   if [[ "$cmd" =~ (start|stop|restart|reload|status) ]]
   then
-    if ! is_docker && ! [[ -d /run/systemd/system ]]
+    if ! is_docker && [[ "$INIT_SYSTEM" != "systemd" ]]
     then
       echo "Probably running in chroot. Ignoring 'metrics_services $cmd'..."
       return 0
diff --git a/etc/ncp-config.d/nc-nextcloud.cfg b/etc/ncp-config.d/nc-nextcloud.cfg
index 8c380318..e3dff293 100644
--- a/etc/ncp-config.d/nc-nextcloud.cfg
+++ b/etc/ncp-config.d/nc-nextcloud.cfg
@@ -9,7 +9,7 @@
     {
       "id": "VER",
       "name": "Version",
-      "value": "23.0.6"
+      "value": "24.0.3"
     },
     {
       "id": "MAXFILESIZE",
diff --git a/etc/ncp.cfg b/etc/ncp.cfg
index 84328ead..33d305f8 100644
--- a/etc/ncp.cfg
+++ b/etc/ncp.cfg
@@ -1,5 +1,5 @@
 {
-	"nextcloud_version": "23.0.6",
+	"nextcloud_version": "24.0.3",
 	"php_version": "7.4",
 	"release": "bullseye"
 }
diff --git a/ncp-app/appinfo/info.xml b/ncp-app/appinfo/info.xml
index ec86c6f7..07b53563 100644
--- a/ncp-app/appinfo/info.xml
+++ b/ncp-app/appinfo/info.xml
@@ -12,7 +12,7 @@
     <category>tools</category>
     <bugs>https://github.com/nextcloud/nextcloudpi/issues</bugs>
     <dependencies>
-        <nextcloud min-version="14" max-version="23"/>
+        <nextcloud min-version="14" max-version="24"/>
     </dependencies>
     <navigations>
         <navigation>
diff --git a/ncp-previewgenerator/ncp-previewgenerator-nc21/appinfo/info.xml b/ncp-previewgenerator/ncp-previewgenerator-nc21/appinfo/info.xml
index f8b29438..5dcb80c4 100644
--- a/ncp-previewgenerator/ncp-previewgenerator-nc21/appinfo/info.xml
+++ b/ncp-previewgenerator/ncp-previewgenerator-nc21/appinfo/info.xml
@@ -25,7 +25,7 @@ The first time you install this app, before using a cron job, you properly want
 	</types>
 	<dependencies>
 		<php min-version="7.2"/>
-		<nextcloud min-version="20" max-version="23" />
+		<nextcloud min-version="20" max-version="24" />
 	</dependencies>
 
 	<commands>