diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 439078b..0435112 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -24,6 +24,7 @@ about: Create a report to help us improve
 * Docker version (type `docker --version`) :
 * Docker compose version if applicable (type `docker-compose --version`) : 
 * Platform (Debian 9, Ubuntu 18.04, ...) : 
+* System info (type `uname -a`) : 
 * Include all necessary configuration files : `docker-compose.yml`, `.env`, ...
 
 ### Docker info
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2136e6..0964637 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.58.1-RC6 (2020/01/23)
+
+* Move Nginx temp folders to `/tmp` (#55)
+
 ## 1.58.1-RC5 (2019/12/20)
 
 * Add snmp-scan option for cron container (#53)
diff --git a/LICENSE b/LICENSE
index 8c81eb2..d24d55a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2019 CrazyMax
+Copyright (c) 2018-2020 CrazyMax
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/rootfs/etc/cont-init.d/02-fix-perms.sh b/rootfs/etc/cont-init.d/02-fix-perms.sh
index 8ba87c0..bf334f1 100644
--- a/rootfs/etc/cont-init.d/02-fix-perms.sh
+++ b/rootfs/etc/cont-init.d/02-fix-perms.sh
@@ -10,5 +10,4 @@ chown -R librenms. \
   /var/log/nginx \
   /var/log/php7 \
   /var/run/nginx \
-  /var/run/php-fpm \
-  /var/tmp/nginx
+  /var/run/php-fpm
diff --git a/rootfs/tpls/etc/nginx/nginx.conf b/rootfs/tpls/etc/nginx/nginx.conf
index bc4b36c..9513ff4 100644
--- a/rootfs/tpls/etc/nginx/nginx.conf
+++ b/rootfs/tpls/etc/nginx/nginx.conf
@@ -17,6 +17,13 @@ http {
     sendfile on;
     large_client_header_buffers 4 16k;
 
+    ## Temp folders
+    client_body_temp_path /tmp/nginx 1 2;
+    proxy_temp_path /tmp/nginx-proxy;
+    fastcgi_temp_path /tmp/nginx-fastcgi;
+    uwsgi_temp_path /tmp/nginx-uwsgi;
+    scgi_temp_path /tmp/nginx-scgi;
+
     ## Timeouts
     client_body_timeout   60;
     client_header_timeout 60;