diff --git a/swh/lister/debian/__init__.py b/swh/lister/debian/__init__.py
--- a/swh/lister/debian/__init__.py
+++ b/swh/lister/debian/__init__.py
@@ -8,41 +8,41 @@
 
 def debian_init(db_engine,
                 override_conf: Mapping[str, Any] = {},
-                distributions: List[str] = ['stretch', 'buster'],
-                area_names: List[str] = ['main', 'contrib', 'non-free']):
+                suites: List[str] = ['stretch', 'buster', 'bullseye'],
+                components: List[str] = ['main', 'contrib', 'non-free']):
     """Initialize the debian data model.
 
     Args:
         db_engine: SQLAlchemy manipulation database object
         override_conf: Override conf to pass to instantiate a lister
-        distributions: Default distribution to build
-
+        suites: Default suites to build
+        components: Default components to build per suite
 
     """
     distribution_name = 'Debian'
     from swh.lister.debian.models import Distribution, Area
     from sqlalchemy.orm import sessionmaker
     db_session = sessionmaker(bind=db_engine)()
-
-    existing_distrib = db_session \
-        .query(Distribution) \
+    distrib = db_session.query(Distribution) \
         .filter(Distribution.name == distribution_name) \
         .one_or_none()
-    if not existing_distrib:
-        distrib = Distribution(name=distribution_name,
-                               type='deb',
-                               mirror_uri='http://deb.debian.org/debian/')
+
+    if distrib is None:
+        distrib = Distribution(
+            name=distribution_name, type='deb',
+            mirror_uri='http://deb.debian.org/debian/'
+        )
         db_session.add(distrib)
 
-        for distribution_name in distributions:
-            for area_name in area_names:
-                area = Area(
-                    name='%s/%s' % (distribution_name, area_name),
-                    distribution=distrib,
-                )
-                db_session.add(area)
+    for suite in suites:
+        for component in components:
+            area = Area(
+                name='%s/%s' % (suite, component),
+                distribution=distrib,
+            )
+            db_session.add(area)
 
-        db_session.commit()
+    db_session.commit()
     db_session.close()
 
 
diff --git a/swh/lister/debian/tests/conftest.py b/swh/lister/debian/tests/conftest.py
--- a/swh/lister/debian/tests/conftest.py
+++ b/swh/lister/debian/tests/conftest.py
@@ -19,9 +19,9 @@
     lister = swh_listers['debian']
 
     # Initialize the debian data model
-    debian_init(lister.db_engine,
-                distributions=['stretch'],
-                area_names=['main', 'contrib'])
+    debian_init(
+        lister.db_engine, suites=['stretch'], components=['main', 'contrib']
+    )
 
     # Add the load-deb-package in the scheduler backend
     lister.scheduler.create_task_type({