diff --git a/webservice/config/serve_overview.yaml b/webservice/config/serve_overview.yaml
index 2da8f8cbc71c7b0a5328ef7ba2ccce12c366b9c3..35af644a4f50530b402705f5e4c39cea050d28b9 100644
--- a/webservice/config/serve_overview.yaml
+++ b/webservice/config/serve_overview.yaml
@@ -26,5 +26,5 @@ server-config:
     n-calib: 10
 
 web-service:
-    job-db: "@format {this.webservice_dir}/webservice_jobs.sqlite"
+    job-db: "@format {this.webservice_dir}/db/webservice_jobs.sqlite"
     cal-config: "@format {env[HOME]}/calibration_config/default.yaml"
diff --git a/webservice/config/webservice.yaml b/webservice/config/webservice.yaml
index 6e1dc5d80f4418bd842527e7e76d4396c3b408e9..db88caba377cc3a9b01f7d95d931633074aecb5d 100644
--- a/webservice/config/webservice.yaml
+++ b/webservice/config/webservice.yaml
@@ -7,7 +7,7 @@ web-service:
   port: 5555
   bind-to: tcp://*
   allowed-ips:
-  job-db: "@format {this.webservice_dir}/webservice_jobs.sqlite"
+  job-db: "@format {this.webservice_dir}/db/webservice_jobs.sqlite"
   job-update-interval: 60
   job-timeout: 3600
 
diff --git a/webservice/sqlite_view.py b/webservice/sqlite_view.py
index 45ab2062e2794a8db812309b4c250a75bdda0d90..4dcc0b4e1546c1687edb05f1323eb41830767611 100644
--- a/webservice/sqlite_view.py
+++ b/webservice/sqlite_view.py
@@ -6,7 +6,7 @@ import sys
 parser = argparse.ArgumentParser(
     description='Check jobs for a given proposal & run number')
 parser.add_argument('--sqlite-fpath', type=str, help='Path to sqlite file path',
-                    default='webservice_jobs.sqlite')
+                    default='db/webservice_jobs.sqlite')
 parser.add_argument('--proposal', type=str, required=True, help='Proposal number')
 parser.add_argument('--run', type=int, required=True, help='Run number')
 
diff --git a/webservice/webservice.py b/webservice/webservice.py
index 0766b82cfe47a3f033521a21ff99330dcd8d18ef..55b97296f4fe314139f3b616e1e733636a550e5c 100644
--- a/webservice/webservice.py
+++ b/webservice/webservice.py
@@ -63,7 +63,9 @@ def init_job_db(config):
     :return: a sqlite3 connection instance to the database
     """
     logging.info("Initializing database")
-    conn = sqlite3.connect(config['web-service']['job-db'])
+    db_path = Path(config['web-service']['job-db'])
+    db_path.parent.mkdir(parents=True, exist_ok=True)
+    conn = sqlite3.connect(db_path)
     conn.execute("PRAGMA foreign_keys = ON")
 
     conn.executescript("""