diff --git a/nextcloud/nextcloud-notify-push.service b/nextcloud/nextcloud-notify-push.service
new file mode 100644
index 0000000..4b320e9
--- /dev/null
+++ b/nextcloud/nextcloud-notify-push.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Push daemon for Nextcloud clients
+Documentation=https://github.com/nextcloud/notify_push
+Requires=nextcloud.service
+After=nextcloud.service
+PartOf=nextcloud.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/podman exec -u 1000 nextcloud \
+  /var/www/html/apps/notify_push/bin/x86_64/notify_push \
+  /var/www/html/config/config.php
+Restart=always
+RestartSec=5
+
+[Install]
+WantedBy=multi-user.target
diff --git a/nextcloud/nextcloud.container b/nextcloud/nextcloud.container
index d8163b6..df143ae 100644
--- a/nextcloud/nextcloud.container
+++ b/nextcloud/nextcloud.container
@@ -14,15 +14,23 @@ Image=docker.io/library/nextcloud:fpm-alpine
 
 # Enable auto-update container
 AutoUpdate=registry
-# pass this to attach it to container
+
+Environment=TZ=${TZ}
+
+# DB credentials
 Environment=MYSQL_PASSWORD=${MARIADB_PASSWORD}
 Environment=MYSQL_DATABASE=${MARIADB_DATABASE}
 Environment=MYSQL_USER=${MARIADB_USER}
 Environment=MYSQL_HOST=localhost:/tmp/docker/mysqld.sock
+
+# PHP Optimizations
 Environment=PHP_MEMORY_LIMIT=2G
 Environment=PHP_UPLOAD_LIMIT=100G
 Environment=PHP_OPCACHE_MEMORY_CONSUMPTION=256
-Environment=PHP_MAX_EXECUTION_TIME=7200
+
+# Nextcloud Notify Push socket
+Environment=SOCKET_PATH=/tmp/docker/notify_push.sock
+
 
 Volume=%h/podman/nextcloud/html:/var/www/html
 Volume=%h/nextcloud:/var/www/html/data
diff --git a/nextcloud/nextcloud_imaginary.container b/nextcloud/nextcloud_imaginary.container
index f4591db..01d3a57 100644
--- a/nextcloud/nextcloud_imaginary.container
+++ b/nextcloud/nextcloud_imaginary.container
@@ -10,6 +10,7 @@ Exec=-enable-url-source -cors
 # Enable auto-update container
 AutoUpdate=registry
 Environment=PORT=9999
+Environment=TZ=${TZ}
 
 # capabilities
 AddCapability=CAP_SYS_NICE
@@ -19,6 +20,7 @@ HealthCmd=none
 HealthInterval=disable
 
 [Service]
+EnvironmentFile=%h/.config/containers/systemd/nextcloud/.env
 Restart=always
 TimeoutStartSec=300
 
diff --git a/nextcloud/readme.md b/nextcloud/readme.md
index 24328b1..ee29d79 100644
--- a/nextcloud/readme.md
+++ b/nextcloud/readme.md
@@ -2,5 +2,7 @@
 
 The nextcloud image is from official nextcloud docker image.
 
+You Need to have Separate Web Server, as this image is based on PHP-FPM.
+
 ## Major Problem
 All Resolved :)