diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index c8ec3fd..e779f72 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -13,6 +13,9 @@ services:
       - layersdb
     build: .
     image: halstead/layerindex-app
+    # "docker compose run" of update.py and the RRS tools: reap the
+    # bitbake servers that recipe parsing leaves behind
+    init: true
     hostname: localhost
     volumes:
      - layersmeta:/opt/workdir
diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml
index 80ceef6..7365bcf 100644
--- a/docker-compose.staging.yml
+++ b/docker-compose.staging.yml
@@ -13,6 +13,9 @@ services:
       - layersdb
     build: .
     image: halstead/layerindex-app
+    # "docker compose run" of update.py and the RRS tools: reap the
+    # bitbake servers that recipe parsing leaves behind
+    init: true
     hostname: localhost
     volumes:
      - layersmeta:/opt/workdir
diff --git a/docker-compose.yml b/docker-compose.yml
index bafa64d..ab9c865 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,6 +10,9 @@ services:
       - layersdb
     build: .
     image: halstead/layerindex-app
+    # "docker compose run" of update.py and the RRS tools: reap the
+    # bitbake servers that recipe parsing leaves behind
+    init: true
     hostname: localhost
     volumes:
      - layersmeta:/opt/workdir
diff --git a/tests/test_dockersetup.py b/tests/test_dockersetup.py
index 0109c80..4d61ee7 100644
--- a/tests/test_dockersetup.py
+++ b/tests/test_dockersetup.py
@@ -200,3 +200,20 @@ def test_compose_command(monkeypatch, result, expected):
         assert calls == [['docker', 'compose', 'version']]
     finally:
         dockersetup.compose_command.cache_clear()
+
+
+@pytest.mark.parametrize('compose_file', ['docker-compose.yml', 'docker-compose.prod.yml',
+                                          'docker-compose.staging.yml'])
+def test_compose_layersapp_has_init(compose_file):
+    # [YOCTO #16515] in "docker compose run --rm layersapp ..." the script is
+    # process 1; without an init process the bitbake servers started by
+    # recipe parsing stay as zombies until the container's process limit is hit
+    with open(os.path.join(basepath, compose_file)) as f:
+        services = yaml.safe_load(f)['services']
+    assert services['layersapp'].get('init') is True
+
+
+def test_compose_keeps_init(workdir):
+    dockersetup.edit_dockercompose('layers.example.com', '8080:80,8081:443', False)
+    services = load_compose(workdir)['services']
+    assert services['layersapp']['init'] is True
