diff --git a/zuul_storage_proxy/__init__.py b/zuul_storage_proxy/__init__.py
index 7dad075..b249542 100644
--- a/zuul_storage_proxy/__init__.py
+++ b/zuul_storage_proxy/__init__.py
@@ -156,12 +156,12 @@ def swift_proxy(environ, start_response, clouds, container_prefix):
         return
 
     if len(components) < 2:
-        # no path inside tenant given, redirect to root index
+        # no container or path given, redirect to root index
         return redirect_directory(start_response, path)
 
-    tenant = components[0]
+    container = components[0]
     path = components[1]
-    container = '-'.join([container_prefix, tenant])
+    container = container_prefix + container
 
     print('%s request %s/%s' % (method, container, path))
     try:
@@ -195,8 +195,10 @@ class CloudCache(object):
         for cloud_name in cloud_names:
             self.log.warning('Using cloud %s', cloud_name)
             self.clouds.append(openstack.connect(cloud=cloud_name))
-        self.container_prefix = os.environ['CONTAINER_PREFIX']
-        self.log.warning('Using container prefix %s', self.container_prefix)
+        self.container_prefix = os.environ.get('CONTAINER_PREFIX', '')
+        if self.container_prefix:
+            self.log.warning('Using container prefix %s',
+                             self.container_prefix)
 
     def __call__(self, environ, start_response):
         for chunk in self.app(environ, start_response, self.clouds,