diff --git a/conf/init/nginx_conf_create.sh b/conf/init/nginx_conf_create.sh
index f2dc9724c..c023f5e4f 100755
--- a/conf/init/nginx_conf_create.sh
+++ b/conf/init/nginx_conf_create.sh
@@ -28,19 +28,17 @@ def generate_server_config(config):
   """
   Generates server config from the app config
   """
-  if config:
-    tuf_server = config.get('TUF_SERVER', None)
-    tuf_host = config.get('TUF_HOST', None)
-    signing_enabled = config.get('FEATURE_SIGNING', False)
-  else:
-    tuf_server = None
-    tuf_host = None
-    signing_enabled = False
+  config = config or {}
+  tuf_server = config.get('TUF_SERVER', None)
+  tuf_host = config.get('TUF_HOST', None)
+  signing_enabled = config.get('FEATURE_SIGNING', False)
+  maximum_layer_size = config.get('MAXIMUM_LAYER_SIZE', '20G')
 
   write_config('conf/nginx/server-base.conf',
                tuf_server=tuf_server,
                tuf_host=tuf_host,
-               signing_enabled=signing_enabled)
+               signing_enabled=signing_enabled,
+               maximum_layer_size=maximum_layer_size)
 
 
 if __name__ == "__main__":
diff --git a/conf/nginx/server-base.conf.jnj b/conf/nginx/server-base.conf.jnj
index ee2fdb259..7b5c69181 100644
--- a/conf/nginx/server-base.conf.jnj
+++ b/conf/nginx/server-base.conf.jnj
@@ -109,7 +109,7 @@ location ~ ^/v2 {
     proxy_pass   http://registry_app_server;
     proxy_temp_path /tmp 1 2;
 
-    client_max_body_size 20G;
+    client_max_body_size {{ maximum_layer_size }};
 }
 
 location ~ ^/v1 {
@@ -127,7 +127,7 @@ location ~ ^/v1 {
     proxy_pass   http://registry_app_server;
     proxy_temp_path /tmp 1 2;
 
-    client_max_body_size 20G;
+    client_max_body_size {{ maximum_layer_size }};
 }
 
 location /v1/_ping {
diff --git a/config.py b/config.py
index 67734bf82..9da6fd30d 100644
--- a/config.py
+++ b/config.py
@@ -426,3 +426,6 @@ class DefaultConfig(object):
 
   # Server where TUF metadata can be found
   TUF_SERVER = None
+
+  # Maximum size allowed for layers in the registry.
+  MAXIMUM_LAYER_SIZE = '20G'