diff --git a/beaker-tests/tests/fedpkg-cache-dir-override-test/dist-git.conf b/beaker-tests/tests/fedpkg-lookaside_dir-test/dist-git.conf
similarity index 84%
rename from beaker-tests/tests/fedpkg-cache-dir-override-test/dist-git.conf
rename to beaker-tests/tests/fedpkg-lookaside_dir-test/dist-git.conf
index 15c2a85..b281c2e 100644
--- a/beaker-tests/tests/fedpkg-cache-dir-override-test/dist-git.conf
+++ b/beaker-tests/tests/fedpkg-lookaside_dir-test/dist-git.conf
@@ -5,7 +5,7 @@ git_author_email = rel-eng@lists.fedoraproject.org
 cache_dir      = /var/lib/dist-git/cache
 gitroot_dir    = /var/lib/dist-git/git
 
-cache_dir_override = /var/lib/dist-git/cache/lookaside/pkgs/ns
+lookaside_dir = /var/lib/dist-git/cache/lookaside/pkgs/ns
 
 gitolite       = True
 grok           = True
diff --git a/beaker-tests/tests/fedpkg-cache-dir-override-test/run.sh b/beaker-tests/tests/fedpkg-lookaside_dir-test/run.sh
similarity index 100%
rename from beaker-tests/tests/fedpkg-cache-dir-override-test/run.sh
rename to beaker-tests/tests/fedpkg-lookaside_dir-test/run.sh
diff --git a/configs/dist-git/dist-git.conf b/configs/dist-git/dist-git.conf
index 60e5c1b..3667618 100644
--- a/configs/dist-git/dist-git.conf
+++ b/configs/dist-git/dist-git.conf
@@ -2,11 +2,11 @@
 git_author_name  = Fedora Release Engineering
 git_author_email = rel-eng@lists.fedoraproject.org
 
-cache_dir      = /var/lib/dist-git/cache
-gitroot_dir    = /var/lib/dist-git/git
-
 # deprecated:
-# cache_dir_override = /var/lib/dist-git/cache/lookaside/pkgs
+# cache_dir    = /var/lib/dist-git/cache
+
+lookaside_dir  = /var/lib/dist-git/cache/lookaside/pkgs
+gitroot_dir    = /var/lib/dist-git/git
 
 gitolite       = True
 grok           = True
diff --git a/docs/scripts/httpd/dist-git-stg.conf b/docs/scripts/httpd/dist-git-stg.conf
index 53babcf..17cf273 100644
--- a/docs/scripts/httpd/dist-git-stg.conf
+++ b/docs/scripts/httpd/dist-git-stg.conf
@@ -2,8 +2,8 @@
 git_author_name  = Release Engineering
 git_author_email = rel-eng@redhat.com
 
-cache_dir      = /srv/cache/lookaside
-cache_dir_override = /srv/cache/lookaside
+cache_dir      = /srv/cache
+lookaside_dir  = /srv/cache/lookaside/pkgs
 
 gitroot_dir    = /srv/git
 
diff --git a/scripts/httpd/upload.cgi b/scripts/httpd/upload.cgi
index 2d095e9..949595c 100644
--- a/scripts/httpd/upload.cgi
+++ b/scripts/httpd/upload.cgi
@@ -176,10 +176,12 @@ def main():
     if config['dist-git'].get('default_namespace'):
         name = ensure_namespaced(name, config['dist-git'].get('default_namespace')).strip('/')
 
-    module_dir = os.path.join(config['dist-git']['cache_dir'], "lookaside/pkgs", name)
-
-    if config['dist-git'].get('cache_dir_override'):
-        module_dir = os.path.join(config['dist-git']['cache_dir_override'], name)
+    if config['dist-git'].get('lookaside_dir'):
+        module_dir = os.path.join(config['dist-git']['lookaside_dir'], name)
+    elif config['dist-git'].get('cache_dir'): # deprecated
+        module_dir = os.path.join(config['dist-git']['cache_dir'], 'lookaside/pkgs', name)
+    else:
+        raise Exception('Please, set lookaside_dir config option.')
 
     hash_dir = os.path.join(module_dir, filename, hash_type, checksum)
     msgpath = os.path.join(name, filename, hash_type, checksum, filename)