diff --git a/service/webodm-celery.service b/service/webodm-celery.service
new file mode 100644
index 00000000..fbd082b0
--- /dev/null
+++ b/service/webodm-celery.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Start WebODM Celery Service Container
+Requires=webodm-nginx.service
+
+[Service]
+Type=simple
+User=odm
+Group=odm
+PIDFile=/run/webodm-celery.pid
+WorkingDirectory=/webodm
+ExecStart=/webodm/python3-venv/bin/celery -A worker worker --autoscale 8,2 --max-tasks-per-child 1000 --loglevel=warn
+ExecStop=/bin/kill -s QUIT $MAINPID
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/service/webodm-celerybeat.service b/service/webodm-celerybeat.service
new file mode 100644
index 00000000..c42091d1
--- /dev/null
+++ b/service/webodm-celerybeat.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Start WebODM Celery Scheduler Service Container
+Requires=webodm-nginx.service
+
+[Service]
+Type=simple
+User=odm
+Group=odm
+PIDFile=/run/webodm-celerybeat.pid
+WorkingDirectory=/webodm
+ExecStart=/webodm/python3-venv/bin/celery -A worker beat
+ExecStop=/bin/kill -s QUIT $MAINPID
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/service/webodm-gunicorn.service b/service/webodm-gunicorn.service
index 036be01e..e5dade94 100644
--- a/service/webodm-gunicorn.service
+++ b/service/webodm-gunicorn.service
@@ -8,9 +8,9 @@ User=odm
 Group=odm
 PIDFile=/run/webodm-gunicorn.pid
 WorkingDirectory=/webodm
-ExecStart=/webodm/python3-venv/bin/gunicorn webodm.wsgi --bind unix:/tmp/gunicorn.sock --timeout 300000 --max-requests 250 --preload
+ExecStart=/webodm/python3-venv/bin/gunicorn webodm.wsgi --bind unix:/webodm/gunicorn.sock --timeout 300000 --max-requests 250 --preload
 ExecStop=/bin/kill -s QUIT $MAINPID
 Restart=on-failure
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/service/webodm-nginx.service b/service/webodm-nginx.service
index 6ffe1b41..6a83bc1a 100644
--- a/service/webodm-nginx.service
+++ b/service/webodm-nginx.service
@@ -1,16 +1,15 @@
 [Unit]
 Description=Start WebODM Nginx Service Container
+After=syslog.target network.target remote-fs.target nss-lookup.target
 
 [Service]
 Type=forking
 PIDFile=/run/webodm-nginx.pid
-ExecStartPre=/usr/sbin/nginx -t
-ExecReload=/bin/kill -s HUP $MAINPID
-ExecStop=/bin/kill -s QUIT $MAINPID
-PrivateTmp=false
+ExecStartPre=/usr/sbin/nginx -t -c /webodm/nginx/nginx.conf
 ExecStart=/usr/sbin/nginx -c /webodm/nginx/nginx.conf
-Restart=on-failure
+ExecReload=/usr/sbin/nginx -s reload
+ExecStop=/bin/kill -s QUIT $MAINPID
+PrivateTmp=true
 
 [Install]
 WantedBy=multi-user.target
-