diff --git a/gui/nginx.conf b/gui/nginx.conf
index 5db1f4d4fbe287176e7f348eee7828c412b31533..ad80ab5adcc0f9c6d0dab8e203b17aab09f0d67a 100644
--- a/gui/nginx.conf
+++ b/gui/nginx.conf
@@ -1,16 +1,21 @@
 server {
    listen        80;
+   server_name   www.example.com;
 
    location /nomadxt  {
-       root    /app/;
+       root      /app/;
    }
 
    location /nomadxt/api {
+       proxy_set_header Host $http_host;
        proxy_pass      http://api:8000;
    }
 
    location ~ ^/nomadxt/objects/(.*)$ {
-       resolver        127.0.0.11 ipv6=off;  # docker embedded DNS
-       proxy_pass      http://minio:9000/$1;
+       client_max_body_size 20g;
+       resolver         127.0.0.11 ipv6=off;  # docker embedded DNS
+       proxy_set_header Host $http_host;
+       proxy_pass       http://minio:9000/$1;
    }
+
 }
diff --git a/infrastructure/.gitignore b/infrastructure/.gitignore
deleted file mode 100644
index 58e90b33ff9777a8fce2ce602f82888460eac65b..0000000000000000000000000000000000000000
--- a/infrastructure/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-data/
-config/
diff --git a/infrastructure/nomadxt/docker-compose.yml b/infrastructure/nomadxt/docker-compose.yml
index 2df0fdf71ba06ad9dc2c623b42ecc07add42ea88..e1665d59687eb3c44e6a3153e270f2f976ada8a4 100644
--- a/infrastructure/nomadxt/docker-compose.yml
+++ b/infrastructure/nomadxt/docker-compose.yml
@@ -25,12 +25,25 @@ services:
             - ${MINIO_HOST_PORT}:9000
         volumes:
             - ${VOLUME_BINDS}/minio:/data
-            - ../config/minio:/root/.minio
         environment:
             - MINIO_ACCESS_KEY=AKIAIOSFODNN7EXAMPLE
             - MINIO_SECRET_KEY=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
         command: server /data
 
+    minio-config:
+        image: minio/mc
+        links:
+            - minio
+        entrypoint: /bin/sh -c "
+            sleep 5;
+            /usr/bin/mc config host add minio http://minio:9000 AKIAIOSFODNN7EXAMPLE wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY;
+            /usr/bin/mc mb minio/uploads -p;
+            /usr/bin/mc mb minio/archive -p;
+            /usr/bin/mc mb minio/repository -p;
+            /usr/bin/mc policy download minio/repository;
+            /usr/bin/mc policy download minio/archive;
+            /usr/bin/mc policy upload minio/uploads;"
+
     # broker for celery
     rabbitmq:
         restart: always
diff --git a/infrastructure/up-wo-elk.sh b/infrastructure/up-wo-elk.sh
deleted file mode 100644
index 113e613a3696e03c04a3d7146632f9d4dd7aac6d..0000000000000000000000000000000000000000
--- a/infrastructure/up-wo-elk.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-docker-compose up minio rabbitmq redis
\ No newline at end of file
diff --git a/nomad/api.py b/nomad/api.py
index bcfaf15218d499a13a5fc6aec199f540e259c90e..4c24ad0e984b744722a86863655a29370f185619 100644
--- a/nomad/api.py
+++ b/nomad/api.py
@@ -30,10 +30,13 @@ if me is None:
 def _external_objects_url(url):
     """ Replaces the given internal object storage url (minio) with an URL that allows
         external access. """
-    port_with_color = '' if config.services.objects_port > 0 else ':%d' % config.services.objects_port
+    port_with_colon = ''
+    if config.services.objects_port > 0:
+        port_with_colon = ':%d' % config.services.objects_port
+
     return url.replace(
         '%s:%s' % (config.minio.host, config.minio.port),
-        '%s:%s%s' % (config.services.objects_host, port_with_color, config.services.objects_base_path))
+        '%s%s%s' % (config.services.objects_host, port_with_colon, config.services.objects_base_path))
 
 
 class Uploads(Resource):
@@ -50,6 +53,7 @@ class Uploads(Resource):
             'name': upload.name,
             'upload_id': upload.upload_id,
             'presigned_url': _external_objects_url(upload.presigned_url),
+            'presigned_orig': upload.presigned_url,
             'create_time': upload.create_time.isoformat() if upload.create_time is not None else None,
             'upload_time': upload.upload_time.isoformat() if upload.upload_time is not None else None,
             'proc_time': upload.proc_time.isoformat() if upload.proc_time is not None else None,
diff --git a/nomad/config.py b/nomad/config.py
index 034280531d28ca467c3e9a2cc0de8fc36272cd7a..fd5206b5cd0c7f05d28701ad6ec2d424d43baca6 100644
--- a/nomad/config.py
+++ b/nomad/config.py
@@ -92,6 +92,6 @@ logstash = LogstashConfig(
 services = NomadServicesConfig(
     api_base_path=os.environ.get('NOMAD_API_BASE_PATH', ''),
     objects_host=os.environ.get('NOMAD_OBJECTS_HOST', 'localhost'),
-    objects_port=int(os.environ.get('NOMAD_OBJECTS_PORT', -1)),
+    objects_port=int(os.environ.get('NOMAD_OBJECTS_PORT', minio.port)),
     objects_base_path=os.environ.get('NOMAD_OBJECTS_BASE_PATH', '')
 )