diff --git a/src/main/java/JettyLauncher.java b/src/main/java/JettyLauncher.java
index 274654a..6fb3dfc 100644
--- a/src/main/java/JettyLauncher.java
+++ b/src/main/java/JettyLauncher.java
@@ -42,6 +42,21 @@
                         case "--max_file_size":
                             System.setProperty("gitbucket.maxFileSize", dim[1]);
                             break;
+                        case "--upload_timeout":
+                            System.setProperty("gitbucket.UploadTimeout", dim[1]);
+                            break;
+                        case "--max_file_size_issues":
+                            System.setProperty("gitbucket.maxFileSizeIssues", dim[1]);
+                            break;
+                        case "--upload_timeout_issues":
+                            System.setProperty("gitbucket.UploadTimeoutIssues", dim[1]);
+                            break;
+                        case "--max_file_size_releases":
+                            System.setProperty("gitbucket.maxFileSizeReleases", dim[1]);
+                            break;
+                        case "--upload_timeout_releases":
+                            System.setProperty("gitbucket.UploadTimeoutReleases", dim[1]);
+                            break;
                         case "--gitbucket.home":
                             System.setProperty("gitbucket.home", dim[1]);
                             break;
@@ -147,4 +162,4 @@
         statisticsHandler.setHandler(handler);
         return statisticsHandler;
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/scala/gitbucket/core/util/FileUtil.scala b/src/main/scala/gitbucket/core/util/FileUtil.scala
index e3e50ac..0f0e35d 100644
--- a/src/main/scala/gitbucket/core/util/FileUtil.scala
+++ b/src/main/scala/gitbucket/core/util/FileUtil.scala
@@ -100,6 +100,30 @@
     if (System.getProperty("gitbucket.UploadTimeout") != null)
       System.getProperty("gitbucket.UploadTimeout").toLong
     else
-      3 * 10000
+      3 * 10
+
+  lazy val MaxFileSizeReleases =
+    if (System.getProperty("gitbucket.maxFileSizeReleases") != null)
+      System.getProperty("gitbucket.maxFileSizeReleases").toLong
+    else
+      MaxFileSize
+
+  lazy val UploadTimeoutIssues =
+    if (System.getProperty("gitbucket.UploadTimeoutIssues") != null)
+      System.getProperty("gitbucket.UploadTimeoutIssues").toLong
+    else
+      UploadTimeout
+
+  lazy val MaxFileSizeIssues =
+    if (System.getProperty("gitbucket.maxFileSizeIssues") != null)
+      System.getProperty("gitbucket.maxFileSizeIssues").toLong
+    else
+      MaxFileSize
+
+  lazy val UploadTimeoutReleases =
+    if (System.getProperty("gitbucket.UploadTimeoutReleases") != null)
+      System.getProperty("gitbucket.UploadTimeoutReleases").toLong
+    else
+      UploadTimeout
 
 }
diff --git a/src/main/twirl/gitbucket/core/helper/attached.scala.html b/src/main/twirl/gitbucket/core/helper/attached.scala.html
index 15a822a..6958927 100644
--- a/src/main/twirl/gitbucket/core/helper/attached.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/attached.scala.html
@@ -65,9 +65,9 @@
 }
 @dropzone(clickable: Boolean, textareaId: Option[String]) = {
   url: '@context.path/upload/file/@repository.owner/@repository.name',
-  maxFilesize: @{FileUtil.MaxFileSize / 1024 / 1024},
-  //timeout defaults to 30 secs
-  timeout: @{FileUtil.UploadTimeout},
+  maxFilesize: @{FileUtil.MaxFileSizeIssues / 1024 / 1024},
+  //timeout defaults to 30 secs - UploadTimeoutIssues
+  timeout: @{FileUtil.UploadTimeoutIssues},
   clickable: @clickable,
   previewTemplate: "<div class=\"dz-preview\">\n  <div class=\"dz-progress\"><span class=\"dz-upload\" data-dz-uploadprogress>Uploading your files...</span></div>\n  <div class=\"dz-error-message\"><span data-dz-errormessage></span></div>\n</div>",
   success: function(file, id) {
diff --git a/src/main/twirl/gitbucket/core/releases/form.scala.html b/src/main/twirl/gitbucket/core/releases/form.scala.html
index ba15b2b..b1614c1 100644
--- a/src/main/twirl/gitbucket/core/releases/form.scala.html
+++ b/src/main/twirl/gitbucket/core/releases/form.scala.html
@@ -71,10 +71,10 @@
   });
 
   $("#drop").dropzone({
-    maxFilesize: @{gitbucket.core.util.FileUtil.MaxFileSize / 1024 / 1024},
+    maxFilesize: @{gitbucket.core.util.FileUtil.MaxFileSizeReleases / 1024 / 1024},
     url: '@context.path/upload/release/@repository.owner/@repository.name/@helpers.encodeRefName(tag.name)',
-    //timeout defaults to 30 secs
-    timeout: @{gitbucket.core.util.FileUtil.UploadTimeout},
+    //timeout defaults to 30 secs - UploadTimeoutReleases
+    timeout: @{gitbucket.core.util.FileUtil.UploadTimeoutReleases},
     previewTemplate: "<div class=\"dz-preview\">\n  <div class=\"dz-progress\"><span class=\"dz-upload\" data-dz-uploadprogress>Uploading your files...</span></div>\n  <div class=\"dz-error-message\"><span data-dz-errormessage></span></div>\n</div>",
     success: function(file, id) {
       var attach =