diff --git a/archivebox/config/constants.py b/archivebox/config/constants.py
index 8f38eecf..fbe0358e 100644
--- a/archivebox/config/constants.py
+++ b/archivebox/config/constants.py
@@ -115,10 +115,11 @@ class ConstantsDict(Mapping):
 
     CONFIG_FILENAME: str = 'ArchiveBox.conf'
     SQL_INDEX_FILENAME: str = 'index.sqlite3'
+    QUEUE_DATABASE_FILENAME: str = 'queue.sqlite3'
 
     CONFIG_FILE: Path                   = DATA_DIR / CONFIG_FILENAME
     DATABASE_FILE: Path                 = DATA_DIR / SQL_INDEX_FILENAME
-    QUEUE_DATABASE_FILE: Path           = DATA_DIR / SQL_INDEX_FILENAME.replace('index.', 'queue.')
+    QUEUE_DATABASE_FILE: Path           = DATA_DIR / QUEUE_DATABASE_FILENAME
 
     JSON_INDEX_FILENAME: str = 'index.json'
     HTML_INDEX_FILENAME: str = 'index.html'
@@ -182,9 +183,11 @@ class ConstantsDict(Mapping):
         LOGS_DIR_NAME,
         CACHE_DIR_NAME,
         LIB_DIR_NAME,
+        TMP_DIR_NAME,
         PERSONAS_DIR_NAME,
         CUSTOM_TEMPLATES_DIR_NAME,
         USER_PLUGINS_DIR_NAME,
+        CRONTABS_DIR_NAME,
     ))
     DATA_DIRS: frozenset[Path] = frozenset(DATA_DIR / dirname for dirname in DATA_DIR_NAMES)
     DATA_FILE_NAMES: frozenset[str] = frozenset((
@@ -192,9 +195,9 @@ class ConstantsDict(Mapping):
         SQL_INDEX_FILENAME,
         f"{SQL_INDEX_FILENAME}-wal",
         f"{SQL_INDEX_FILENAME}-shm",
-        "queue.sqlite3",
-        "queue.sqlite3-wal",
-        "queue.sqlite3-shm",
+        QUEUE_DATABASE_FILENAME,
+        f"{QUEUE_DATABASE_FILENAME}-wal",
+        f"{QUEUE_DATABASE_FILENAME}-shm",
         "search.sqlite3",
         JSON_INDEX_FILENAME,
         HTML_INDEX_FILENAME,
diff --git a/archivebox/core/settings.py b/archivebox/core/settings.py
index 7be4f3e6..77806188 100644
--- a/archivebox/core/settings.py
+++ b/archivebox/core/settings.py
@@ -217,11 +217,8 @@ TEMPLATES = [
 # CACHE_DB_PATH = CONSTANTS.CACHE_DIR / CACHE_DB_FILENAME
 # CACHE_DB_TABLE = 'django_cache'
 
-DATABASE_FILE = DATA_DIR / CONSTANTS.SQL_INDEX_FILENAME
 DATABASE_NAME = os.environ.get("ARCHIVEBOX_DATABASE_NAME", str(CONSTANTS.DATABASE_FILE))
 
-QUEUE_DATABASE_NAME = DATABASE_NAME.replace('index.sqlite3', 'queue.sqlite3')
-
 SQLITE_CONNECTION_OPTIONS = {
     "ENGINE": "django.db.backends.sqlite3",
     "TIME_ZONE": CONSTANTS.TIMEZONE,
@@ -250,7 +247,7 @@ DATABASES = {
         **SQLITE_CONNECTION_OPTIONS,
     },
     "queue": {
-        "NAME": QUEUE_DATABASE_NAME,
+        "NAME": CONSTANTS.QUEUE_DATABASE_FILE,
         **SQLITE_CONNECTION_OPTIONS,
     },
     # 'cache': {
@@ -266,7 +263,7 @@ DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
 HUEY = {
     "huey_class": "huey.SqliteHuey",
-    "filename": QUEUE_DATABASE_NAME,
+    "filename": CONSTANTS.QUEUE_DATABASE_FILENAME,
     "name": "system_tasks",
     "results": True,
     "store_none": True,
@@ -292,7 +289,7 @@ DJANGO_HUEY = {
     "queues": {
         HUEY["name"]: HUEY.copy(),
         # more registered here at plugin import-time by BaseQueue.register()
-        **abx.django.use.get_DJANGO_HUEY_QUEUES(QUEUE_DATABASE_NAME=QUEUE_DATABASE_NAME),
+        **abx.django.use.get_DJANGO_HUEY_QUEUES(QUEUE_DATABASE_NAME=CONSTANTS.QUEUE_DATABASE_FILENAME),
     },
 }