diff --git a/boefjes/boefjes/katalogus/plugins.py b/boefjes/boefjes/katalogus/plugins.py
index 1284401726a..6dc26614c50 100644
--- a/boefjes/boefjes/katalogus/plugins.py
+++ b/boefjes/boefjes/katalogus/plugins.py
@@ -15,6 +15,7 @@
     get_plugins_filter_parameters,
 )
 from boefjes.models import FilterParameters, PaginationParameters, PluginType
+from boefjes.sql.db_models import RunOn
 from boefjes.sql.plugin_storage import get_plugin_storage
 from boefjes.storage.interfaces import DuplicatePlugin, IntegrityError, NotAllowed, PluginStorage
 
@@ -130,6 +131,7 @@ class BoefjeIn(BaseModel):
     boefje_schema: dict | None = None
     cron: str | None = None
     interval: int | None = None
+    run_on: list[RunOn] | None = None
     oci_image: str | None = None
     oci_arguments: list[str] = Field(default_factory=list)
 
diff --git a/boefjes/boefjes/migrations/versions/fc0295b38184_add_run_on_field_to_boefje.py b/boefjes/boefjes/migrations/versions/fc0295b38184_add_run_on_field_to_boefje.py
new file mode 100644
index 00000000000..e88df9d369f
--- /dev/null
+++ b/boefjes/boefjes/migrations/versions/fc0295b38184_add_run_on_field_to_boefje.py
@@ -0,0 +1,33 @@
+"""Add run on field to boefje
+
+Revision ID: fc0295b38184
+Revises: 9f48560b0000
+Create Date: 2025-02-04 16:43:59.171960
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "fc0295b38184"
+down_revision = "9f48560b0000"
+branch_labels = None
+depends_on = None
+
+
+run_on = sa.Enum("create", "update", "create_update", name="run_on")
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    run_on.create(op.get_bind())
+    op.add_column("boefje", sa.Column("run_on", run_on, nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("boefje", "run_on")
+    run_on.drop(op.get_bind(), checkfirst=False)
+    # ### end Alembic commands ###
diff --git a/boefjes/boefjes/models.py b/boefjes/boefjes/models.py
index 752de2aa298..409661f20c0 100644
--- a/boefjes/boefjes/models.py
+++ b/boefjes/boefjes/models.py
@@ -1,5 +1,6 @@
 import datetime
 from enum import Enum
+from functools import total_ordering
 from typing import Literal
 
 from croniter import croniter
@@ -8,6 +9,18 @@
 from pydantic import BaseModel, Field, field_validator
 
 
+# This makes the RunOn sortable when in a list. This is convenient for e.g. the RunOnDB.from_run_ons method, that now
+# does not have to take the ordering of a boefje.run_on into account in its match statement. This is especially handy
+# once we introduce more RunOn values such as DELETE.
+@total_ordering
+class RunOn(Enum):
+    CREATE = "create"
+    UPDATE = "update"
+
+    def __lt__(self, other):
+        return self.value < other.value
+
+
 class Organisation(BaseModel):
     id: str
     name: str
@@ -34,6 +47,7 @@ class Boefje(Plugin):
     boefje_schema: dict | None = None
     cron: str | None = None
     interval: int | None = None
+    run_on: list[RunOn] | None = None
     runnable_hash: str | None = None
     oci_image: str | None = None
     oci_arguments: list[str] = Field(default_factory=list)
diff --git a/boefjes/boefjes/plugins/kat_export_http/boefje.json b/boefjes/boefjes/plugins/kat_export_http/boefje.json
index 1d7832a0137..beba4043c07 100644
--- a/boefjes/boefjes/plugins/kat_export_http/boefje.json
+++ b/boefjes/boefjes/plugins/kat_export_http/boefje.json
@@ -5,8 +5,5 @@
   "consumes": [],
   "scan_level": 4,
   "oci_image": "ghcr.io/minvws/openkat/export-http:latest",
-  "run_on": [
-    "create",
-    "update"
-  ]
+  "run_on": ["create", "update"]
 }
diff --git a/boefjes/boefjes/sql/db_models.py b/boefjes/boefjes/sql/db_models.py
index d2b9a15e4b8..a0c9245163f 100644
--- a/boefjes/boefjes/sql/db_models.py
+++ b/boefjes/boefjes/sql/db_models.py
@@ -3,6 +3,7 @@
 from sqlalchemy import Boolean, Column, ForeignKey, Integer, String, UniqueConstraint, types
 from sqlalchemy.orm import relationship
 
+from boefjes.models import RunOn
 from boefjes.sql.db import SQL_BASE
 
 
@@ -14,6 +15,36 @@ class ScanLevel(Enum):
     L4 = 4
 
 
+class RunOnDB(Enum):
+    CREATE = "create"
+    UPDATE = "update"
+    CREATE_UPDATE = "create_update"
+
+    @classmethod
+    def from_run_ons(cls, run_ons: list[RunOn] | None):
+        if run_ons is None:
+            return None
+
+        match sorted(run_ons):
+            case [RunOn.CREATE]:
+                return cls.CREATE
+            case [RunOn.UPDATE]:
+                return cls.UPDATE
+            case [RunOn.CREATE, RunOn.UPDATE]:
+                return cls.CREATE_UPDATE
+            case _:
+                return None
+
+    def to_run_ons(self) -> list[RunOn]:
+        match self:
+            case RunOnDB.CREATE:
+                return [RunOn.CREATE]
+            case RunOnDB.UPDATE:
+                return [RunOn.UPDATE]
+            case RunOnDB.CREATE_UPDATE:
+                return [RunOn.CREATE, RunOn.UPDATE]
+
+
 class OrganisationInDB(SQL_BASE):
     __tablename__ = "organisation"
 
@@ -72,6 +103,7 @@ class BoefjeInDB(SQL_BASE):
     schema = Column(types.JSON(), nullable=True)
     cron = Column(types.String(length=128), nullable=True)
     interval = Column(types.Integer, nullable=True)
+    run_on = Column(types.Enum(*[x.value for x in RunOnDB], name="run_on"), nullable=True)
 
     # Image specifications
     oci_image = Column(types.String(length=256), nullable=True)
diff --git a/boefjes/boefjes/sql/plugin_storage.py b/boefjes/boefjes/sql/plugin_storage.py
index 204f7fb8e21..57bc46c4a33 100644
--- a/boefjes/boefjes/sql/plugin_storage.py
+++ b/boefjes/boefjes/sql/plugin_storage.py
@@ -6,7 +6,7 @@
 from boefjes.config import Settings, settings
 from boefjes.models import Boefje, Normalizer, PluginType
 from boefjes.sql.db import ObjectNotFoundException, session_managed_iterator
-from boefjes.sql.db_models import BoefjeInDB, NormalizerInDB
+from boefjes.sql.db_models import BoefjeInDB, NormalizerInDB, RunOnDB
 from boefjes.sql.session import SessionMixin
 from boefjes.storage.interfaces import NotAllowed, PluginNotFound, PluginStorage
 
@@ -98,6 +98,7 @@ def _db_normalizer_instance_by_id(self, normalizer_id: str) -> NormalizerInDB:
 
     @staticmethod
     def to_boefje_in_db(boefje: Boefje, pk: int | None = None) -> BoefjeInDB:
+        run_on_db = RunOnDB.from_run_ons(boefje.run_on)
         boefje = BoefjeInDB(
             plugin_id=boefje.id,
             created=boefje.created,
@@ -109,6 +110,7 @@ def to_boefje_in_db(boefje: Boefje, pk: int | None = None) -> BoefjeInDB:
             schema=boefje.boefje_schema,
             cron=boefje.cron,
             interval=boefje.interval,
+            run_on=run_on_db.value if run_on_db is not None else None,
             oci_image=boefje.oci_image,
             oci_arguments=boefje.oci_arguments,
             version=boefje.version,
@@ -152,6 +154,7 @@ def to_boefje(boefje_in_db: BoefjeInDB) -> Boefje:
             boefje_schema=boefje_in_db.schema,
             cron=boefje_in_db.cron,
             interval=boefje_in_db.interval,
+            run_on=RunOnDB(boefje_in_db.run_on).to_run_ons() if boefje_in_db.run_on else None,
             oci_image=boefje_in_db.oci_image,
             oci_arguments=boefje_in_db.oci_arguments,
             version=boefje_in_db.version,
diff --git a/boefjes/tests/integration/test_api.py b/boefjes/tests/integration/test_api.py
index 6c2ae495f47..e49fbe5ad86 100644
--- a/boefjes/tests/integration/test_api.py
+++ b/boefjes/tests/integration/test_api.py
@@ -83,6 +83,22 @@ def test_enable_boefje(test_client, organisation, second_organisation):
     assert response.json()["enabled"] is False
 
 
+def test_run_on(test_client, organisation, second_organisation):
+    test_client.patch(f"/v1/organisations/{organisation.id}/plugins/export-to-http-api", json={"enabled": True})
+
+    response = test_client.get(f"/v1/organisations/{organisation.id}/plugins/export-to-http-api")
+    assert response.json()["enabled"] is True
+    assert response.json()["run_on"] == ["create", "update"]
+
+    boefje = Boefje(id="test_run_on", name="Run On", static=False, run_on=["create"])
+    response = test_client.post(f"/v1/organisations/{organisation.id}/plugins", content=boefje.model_dump_json())
+    assert response.status_code == 201
+
+    response = test_client.get(f"/v1/organisations/{organisation.id}/plugins/test_run_on")
+    assert response.json()["enabled"] is False
+    assert response.json()["run_on"] == [x.value for x in boefje.run_on]
+
+
 def test_cannot_add_static_plugin_with_duplicate_name(test_client, organisation):
     boefje = Boefje(id="test_plugin", name="DNS records", static=False)
     response = test_client.post(f"/v1/organisations/{organisation.id}/plugins", content=boefje.model_dump_json())
diff --git a/boefjes/tests/test_models.py b/boefjes/tests/test_models.py
new file mode 100644
index 00000000000..3b8eb94ccd7
--- /dev/null
+++ b/boefjes/tests/test_models.py
@@ -0,0 +1,15 @@
+from boefjes.models import RunOn
+from boefjes.sql.db_models import RunOnDB
+
+
+def test_run_on():
+    assert RunOnDB.from_run_ons([RunOn.CREATE]) == RunOnDB.CREATE
+    assert RunOnDB.from_run_ons([RunOn.UPDATE]) == RunOnDB.UPDATE
+    assert RunOnDB.from_run_ons([RunOn.CREATE, RunOn.UPDATE]) == RunOnDB.CREATE_UPDATE
+    assert RunOnDB.from_run_ons([RunOn.UPDATE, RunOn.CREATE]) == RunOnDB.CREATE_UPDATE
+    assert RunOnDB.from_run_ons([1]) is None
+    assert RunOnDB.from_run_ons([]) is None
+
+    assert RunOnDB.CREATE.to_run_ons() == [RunOn.CREATE]
+    assert RunOnDB.UPDATE.to_run_ons() == [RunOn.UPDATE]
+    assert RunOnDB.CREATE_UPDATE.to_run_ons() == [RunOn.CREATE, RunOn.UPDATE]
diff --git a/mula/scheduler/models/ooi.py b/mula/scheduler/models/ooi.py
index e1bf51c4c7f..94edb1570ce 100644
--- a/mula/scheduler/models/ooi.py
+++ b/mula/scheduler/models/ooi.py
@@ -9,6 +9,11 @@ class MutationOperationType(Enum):
     DELETE = "delete"
 
 
+class RunOn(Enum):
+    CREATE = MutationOperationType.CREATE.value
+    UPDATE = MutationOperationType.UPDATE.value
+
+
 class ScanProfile(BaseModel):
     level: int
     reference: str
diff --git a/mula/scheduler/models/plugin.py b/mula/scheduler/models/plugin.py
index 6c784a49d9f..9afa2ec7379 100644
--- a/mula/scheduler/models/plugin.py
+++ b/mula/scheduler/models/plugin.py
@@ -2,6 +2,8 @@
 
 from pydantic import BaseModel
 
+from scheduler.models.ooi import RunOn
+
 
 class Plugin(BaseModel):
     id: str
@@ -19,4 +21,4 @@ class Plugin(BaseModel):
     produces: list[str]
     cron: str | None = None
     interval: int | None = None
-    run_on: list[str] | None = None
+    run_on: list[RunOn] | None = None
diff --git a/mula/scheduler/schedulers/schedulers/boefje.py b/mula/scheduler/schedulers/schedulers/boefje.py
index 260b5cb40db..7310853f26a 100644
--- a/mula/scheduler/schedulers/schedulers/boefje.py
+++ b/mula/scheduler/schedulers/schedulers/boefje.py
@@ -21,6 +21,7 @@
     Task,
     TaskStatus,
 )
+from scheduler.models.ooi import RunOn
 from scheduler.schedulers import Scheduler
 from scheduler.schedulers.queue import PriorityQueue, QueueFullError
 from scheduler.schedulers.rankers import BoefjeRanker
@@ -214,9 +215,9 @@ def push_tasks_for_scan_profile_mutations(self, body: bytes) -> None:
                     create_schedule = False
                     run_task = False
                     if mutation.operation == MutationOperationType.CREATE:
-                        run_task = "create" in boefje.run_on
+                        run_task = RunOn.CREATE in boefje.run_on
                     elif mutation.operation == MutationOperationType.UPDATE:
-                        run_task = "update" in boefje.run_on
+                        run_task = RunOn.UPDATE in boefje.run_on
 
                 if not run_task:
                     self.logger.debug(
diff --git a/mula/tests/factories/plugin.py b/mula/tests/factories/plugin.py
index 4ce894d884b..3432213a58d 100644
--- a/mula/tests/factories/plugin.py
+++ b/mula/tests/factories/plugin.py
@@ -1,5 +1,6 @@
 from factory import Factory, LazyFunction, Sequence, fuzzy
 from scheduler.models import Plugin
+from scheduler.models.ooi import RunOn
 
 
 class PluginFactory(Factory):
@@ -13,4 +14,4 @@ class Meta:
     enabled: bool = True
     cron: str | None = None
     interval: int | None = None
-    run_on: list[str] | None = None
+    run_on: RunOn | None = None
diff --git a/mula/tests/integration/test_boefje_scheduler.py b/mula/tests/integration/test_boefje_scheduler.py
index 616a25da600..9fcc9585ce6 100644
--- a/mula/tests/integration/test_boefje_scheduler.py
+++ b/mula/tests/integration/test_boefje_scheduler.py
@@ -4,6 +4,7 @@
 from unittest import mock
 
 from scheduler import clients, config, models, schedulers, storage
+from scheduler.models.ooi import RunOn
 from scheduler.storage import stores
 from structlog.testing import capture_logs
 
@@ -1283,7 +1284,7 @@ def test_push_tasks_for_scan_profile_mutations_op_create_run_on_create(self):
         # Arrange
         scan_profile = ScanProfileFactory(level=0)
         ooi = OOIFactory(scan_profile=scan_profile)
-        boefje = PluginFactory(scan_level=0, consumes=[ooi.object_type], run_on=["create"])
+        boefje = PluginFactory(scan_level=0, consumes=[ooi.object_type], run_on=[RunOn.CREATE])
         mutation = models.ScanProfileMutation(
             operation=models.MutationOperationType.CREATE, primary_key=ooi.primary_key, value=ooi
         ).model_dump_json()
@@ -1320,7 +1321,7 @@ def test_push_tasks_for_scan_profile_mutations_op_create_run_on_create_update(se
         # Arrange
         scan_profile = ScanProfileFactory(level=0)
         ooi = OOIFactory(scan_profile=scan_profile)
-        boefje = PluginFactory(scan_level=0, consumes=[ooi.object_type], run_on=["create", "update"])
+        boefje = PluginFactory(scan_level=0, consumes=[ooi.object_type], run_on=[RunOn.CREATE, RunOn.UPDATE])
         mutation = models.ScanProfileMutation(
             operation=models.MutationOperationType.CREATE, primary_key=ooi.primary_key, value=ooi
         ).model_dump_json()
@@ -1357,7 +1358,7 @@ def test_push_tasks_for_scan_profile_mutations_op_create_run_on_update(self):
         # Arrange
         scan_profile = ScanProfileFactory(level=0)
         ooi = OOIFactory(scan_profile=scan_profile)
-        boefje = PluginFactory(scan_level=0, consumes=[ooi.object_type], run_on=["update"])
+        boefje = PluginFactory(scan_level=0, consumes=[ooi.object_type], run_on=[RunOn.UPDATE])
         mutation = models.ScanProfileMutation(
             operation=models.MutationOperationType.CREATE, primary_key=ooi.primary_key, value=ooi
         ).model_dump_json()
@@ -1381,7 +1382,7 @@ def test_push_tasks_for_scan_profile_mutations_op_create_run_on_none(self):
         # Arrange
         scan_profile = ScanProfileFactory(level=0)
         ooi = OOIFactory(scan_profile=scan_profile)
-        boefje = PluginFactory(scan_level=0, consumes=[ooi.object_type], run_on=[])
+        boefje = PluginFactory(scan_level=0, consumes=[ooi.object_type], run_on=None)
         mutation = models.ScanProfileMutation(
             operation=models.MutationOperationType.CREATE, primary_key=ooi.primary_key, value=ooi
         ).model_dump_json()
@@ -1419,7 +1420,7 @@ def test_push_tasks_for_scan_profile_mutations_op_update_run_on_create(self):
         # Arrange
         scan_profile = ScanProfileFactory(level=0)
         ooi = OOIFactory(scan_profile=scan_profile)
-        boefje = PluginFactory(scan_level=0, consumes=[ooi.object_type], run_on=["create"])
+        boefje = PluginFactory(scan_level=0, consumes=[ooi.object_type], run_on=[RunOn.CREATE])
         mutation = models.ScanProfileMutation(
             operation=models.MutationOperationType.UPDATE, primary_key=ooi.primary_key, value=ooi
         ).model_dump_json()
@@ -1443,7 +1444,7 @@ def test_push_tasks_scan_profile_mutations_op_update_run_on_create_update(self):
         # Arrange
         scan_profile = ScanProfileFactory(level=0)
         ooi = OOIFactory(scan_profile=scan_profile)
-        boefje = PluginFactory(scan_level=0, consumes=[ooi.object_type], run_on=["create", "update"])
+        boefje = PluginFactory(scan_level=0, consumes=[ooi.object_type], run_on=[RunOn.CREATE, RunOn.UPDATE])
         mutation = models.ScanProfileMutation(
             operation=models.MutationOperationType.UPDATE, primary_key=ooi.primary_key, value=ooi
         ).model_dump_json()
@@ -1480,7 +1481,7 @@ def test_push_tasks_scan_profile_mutations_op_update_run_on_update(self):
         # Arrange
         scan_profile = ScanProfileFactory(level=0)
         ooi = OOIFactory(scan_profile=scan_profile)
-        boefje = PluginFactory(scan_level=0, consumes=[ooi.object_type], run_on=["update"])
+        boefje = PluginFactory(scan_level=0, consumes=[ooi.object_type], run_on=[RunOn.UPDATE])
         mutation = models.ScanProfileMutation(
             operation=models.MutationOperationType.UPDATE, primary_key=ooi.primary_key, value=ooi
         ).model_dump_json()
@@ -1517,7 +1518,7 @@ def test_push_tasks_scan_profile_mutations_op_update_run_on_none(self):
         # Arrange
         scan_profile = ScanProfileFactory(level=0)
         ooi = OOIFactory(scan_profile=scan_profile)
-        boefje = PluginFactory(scan_level=0, consumes=[ooi.object_type], run_on=[])
+        boefje = PluginFactory(scan_level=0, consumes=[ooi.object_type], run_on=None)
         mutation = models.ScanProfileMutation(
             operation=models.MutationOperationType.UPDATE, primary_key=ooi.primary_key, value=ooi
         ).model_dump_json()
diff --git a/rocky/assets/js/choiceToggle.js b/rocky/assets/js/choiceToggle.js
new file mode 100644
index 00000000000..283d854fb6d
--- /dev/null
+++ b/rocky/assets/js/choiceToggle.js
@@ -0,0 +1,48 @@
+function toggleChoice(form, group, active_value) {
+  // Groups are input/label pairs i their respective parent Div's
+  // find all groups that are bound to this toggler by its data-choicegroup attribute value
+  let all_groups = form.querySelectorAll("." + group);
+  all_groups.forEach(function (groupfield) {
+    // find the label, from there we find the bounding parent div.
+    let associated_label = form.querySelector(
+      "label[for='" + groupfield.id + "']",
+    );
+    // lets hide them all initially
+    associated_label.parentNode.classList.add("hidden");
+  });
+
+  if (active_value) {
+    // find all groups that should be visible
+    let active_groups = form.querySelectorAll("." + group + "." + active_value);
+    active_groups.forEach(function (active_group) {
+      // find the label, from there we find the bounding parent div.
+      let associated_active_label = form.querySelector(
+        "label[for='" + active_group.id + "']",
+      );
+      associated_active_label.parentNode.classList.remove("hidden");
+    });
+  }
+}
+
+function initChoiceTogglers() {
+  const forms = document.querySelectorAll("form");
+
+  forms.forEach(function (form) {
+    // are there any currently active choices?
+    let initial = form.querySelector("input.radio-choice:checked");
+    if (initial) {
+      toggleChoice(form, initial.dataset.choicegroup, initial.value);
+    }
+    // lets catch all change events on the forms, and filter out those that are created by inputs with out radio-choice class
+    form.addEventListener("change", function (event) {
+      let tag = event.target;
+      if (tag.tagName == "INPUT" && tag.classList.contains("radio-choice")) {
+        let toggle_group = tag.dataset.choicegroup;
+        let visible_group = tag.value;
+        toggleChoice(tag.form, toggle_group, visible_group);
+      }
+    });
+  });
+}
+
+document.addEventListener("DOMContentLoaded", initChoiceTogglers);
diff --git a/rocky/katalogus/client.py b/rocky/katalogus/client.py
index 38d6274682d..7645f464488 100644
--- a/rocky/katalogus/client.py
+++ b/rocky/katalogus/client.py
@@ -67,6 +67,7 @@ class Boefje(Plugin):
     options: list[str] | None = None
     runnable_hash: str | None = None
     interval: int | None = None
+    run_on: list[str] | None = None
     boefje_schema: dict | None = None
     oci_image: str | None = None
     oci_arguments: list[str] = Field(default_factory=list)
@@ -290,10 +291,9 @@ def edit_plugin(self, organization_code: str, plugin: Plugin) -> None:
         try:
             logger.info("Editing boefje", event_code=800026, boefje=plugin.id)
             response = self.session.patch(
-                f"/v1/organisations/{quote(organization_code)}/boefjes/{plugin.id}",
-                content=plugin.model_dump_json(exclude_none=True),
+                f"/v1/organisations/{quote(organization_code)}/boefjes/{plugin.id}", content=plugin.model_dump_json()
             )
-            if response.status_code == codes.CREATED:
+            if response.status_code == codes.NO_CONTENT:
                 logger.info("Plugin %s updated", plugin.name)
             else:
                 logger.info("Plugin %s could not be updated", plugin.name)
@@ -426,6 +426,7 @@ def parse_boefje(boefje: dict) -> Boefje:
         created=boefje.get("created"),
         description=boefje.get("description"),
         interval=boefje.get("interval"),
+        run_on=boefje.get("run_on"),
         enabled=boefje["enabled"],
         type=boefje["type"],
         scan_level=scan_level,
diff --git a/rocky/katalogus/templates/boefje_setup.html b/rocky/katalogus/templates/boefje_setup.html
index 48c2d75c0fe..96b66840ac1 100644
--- a/rocky/katalogus/templates/boefje_setup.html
+++ b/rocky/katalogus/templates/boefje_setup.html
@@ -2,6 +2,7 @@
 
 {% load i18n %}
 {% load static %}
+{% load compress %}
 
 {% block content %}
     {% include "header.html" %}
@@ -46,3 +47,9 @@ <h1>{% translate "Boefje setup" %}</h1>
         </section>
     </main>
 {% endblock content %}
+{% block html_at_end_body %}
+    {{ block.super }}
+    {% compress js %}
+        <script src="{% static "js/choiceToggle.js" %}" nonce="{{ request.csp_nonce }}"></script>
+    {% endcompress %}
+{% endblock html_at_end_body %}
diff --git a/rocky/katalogus/templates/plugin_container_image.html b/rocky/katalogus/templates/plugin_container_image.html
index 7cfadd1c5a7..476610473a4 100644
--- a/rocky/katalogus/templates/plugin_container_image.html
+++ b/rocky/katalogus/templates/plugin_container_image.html
@@ -46,7 +46,8 @@ <h3>{% translate "Variants" %}</h3>
                                     <th scope="col">{% translate "Scan level" %}</th>
                                     <th scope="col">{% translate "Status" %}</th>
                                     <th scope="col">{% translate "Age" %}</th>
-                                    <th scope="col">{% translate "Scan frequency" %}</th>
+                                    <th scope="col">{% translate "Scan interval" %}</th>
+                                    <th scope="col">{% translate "Run on" %}</th>
                                     <th scope="col"></th>
                                 </tr>
                             </thead>
@@ -80,11 +81,22 @@ <h3>{% translate "Variants" %}</h3>
                                             <span title="{{ variant.interval }}">
                                                 {% if variant.interval %}
                                                     {{ variant.interval }} {% translate "minutes" %}
+                                                {% elif variant.run_on %}
+                                                    -
                                                 {% else %}
                                                     {% translate "Default system scan frequency" %}
                                                 {% endif %}
                                             </span>
                                         </td>
+                                        <td>
+                                            <span title="{{ variant.run_on }}">
+                                                {% if variant.run_on %}
+                                                    {{ variant.run_on|join:", "|capfirst }}
+                                                {% else %}
+                                                    -
+                                                {% endif %}
+                                            </span>
+                                        </td>
                                         <td class="actions">
                                             <button class="expando-button"
                                                     data-icon-open-class="icon ti-chevron-down"
diff --git a/rocky/katalogus/views/boefje_setup.py b/rocky/katalogus/views/boefje_setup.py
index 8ab588aa97b..6873f3f8848 100644
--- a/rocky/katalogus/views/boefje_setup.py
+++ b/rocky/katalogus/views/boefje_setup.py
@@ -34,10 +34,6 @@ def get_success_url(self) -> str:
             + self.query_params
         )
 
-
-class AddBoefjeView(BoefjeSetupView):
-    """View where the user can create a new Boefje"""
-
     def form_valid(self, form):
         form_data = form.cleaned_data
         plugin = create_boefje_with_form_data(form_data, self.plugin_id, self.created)
@@ -50,6 +46,10 @@ def form_valid(self, form):
                 form.add_error("name", ("Boefje with this name does already exist. Please choose another name."))
             return self.form_invalid(form)
 
+
+class AddBoefjeView(BoefjeSetupView):
+    """View where the user can create a new Boefje"""
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
@@ -88,21 +88,15 @@ def get_initial(self):
         initial["consumes"] = consumes
         initial["produces"] = ", ".join(self.plugin.produces)
         initial["scan_level"] = self.plugin.scan_level
-        initial["interval"] = self.plugin.interval
+        initial["interval_number"] = self.plugin.interval
+        initial["interval_frequency"] = "minutes"
+        initial["run_on"] = "-".join(self.plugin.run_on) if self.plugin.run_on else None
 
-        return initial
+        initial["scan_type"] = "interval"
+        if self.plugin.run_on:
+            initial["scan_type"] = "run_on"
 
-    def form_valid(self, form):
-        form_data = form.cleaned_data
-        plugin = create_boefje_with_form_data(form_data, self.plugin_id, self.created)
-
-        try:
-            self.get_katalogus().create_plugin(plugin)
-            return super().form_valid(form)
-        except DuplicatePluginError as error:
-            if "name" in error.message:
-                form.add_error("name", ("Boefje with this name does already exist. Please choose another name."))
-            return self.form_invalid(form)
+        return initial
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -157,7 +151,13 @@ def get_initial(self):
         initial["consumes"] = consumes
         initial["produces"] = ", ".join(self.plugin.produces)
         initial["scan_level"] = self.plugin.scan_level
-        initial["interval"] = self.plugin.interval
+        initial["interval_number"] = self.plugin.interval
+        initial["interval_frequency"] = "minutes"
+        initial["run_on"] = "-".join(self.plugin.run_on) if self.plugin.run_on else None
+
+        initial["scan_type"] = "interval"
+        if self.plugin.run_on:
+            initial["scan_type"] = "run_on"
 
         return initial
 
@@ -211,7 +211,14 @@ def create_boefje_with_form_data(form_data, plugin_id: str, created: str | None)
     consumes = [] if not form_data["consumes"] else form_data["consumes"].strip("[]").replace("'", "").split(", ")
     produces = [] if not form_data["produces"] else form_data["produces"].split(",")
     produces = {p.strip() for p in produces}
-    interval = int(form_data.get("interval") or 0) or None
+    interval = None
+    run_on = None
+
+    if form_data["scan_type"] == "interval" and form_data.get("interval_number"):
+        interval = get_interval_minutes(int(form_data["interval_number"]), form_data["interval_frequency"])
+    elif form_data["scan_type"] == "run_on":
+        run_on = form_data["run_on"].split("-")
+
     input_objects = set()
 
     for input_object in consumes:
@@ -223,6 +230,7 @@ def create_boefje_with_form_data(form_data, plugin_id: str, created: str | None)
         created=created,
         description=form_data["description"],
         interval=interval,
+        run_on=run_on,
         enabled=False,
         type="boefje",
         scan_level=form_data["scan_level"],
@@ -232,3 +240,18 @@ def create_boefje_with_form_data(form_data, plugin_id: str, created: str | None)
         oci_image=form_data["oci_image"],
         oci_arguments=arguments,
     )
+
+
+def get_interval_minutes(interval_number, interval_frequency) -> int | None:
+    if interval_frequency == "minutes":
+        return int(interval_number)
+    if interval_frequency == "hours":
+        return int(interval_number * 60)
+    if interval_frequency == "days":
+        return int(interval_number * 60 * 24)
+    if interval_frequency == "weeks":
+        return int(interval_number * 60 * 24 * 7)
+    if interval_frequency == "years":
+        return int(interval_number * 60 * 24 * 365)
+
+    return None
diff --git a/rocky/rocky/locale/django.pot b/rocky/rocky/locale/django.pot
index f7714e53631..70d3f03f2b4 100644
--- a/rocky/rocky/locale/django.pot
+++ b/rocky/rocky/locale/django.pot
@@ -1230,8 +1230,12 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
-msgid "Scan frequency"
+#: katalogus/templates/plugin_container_image.html
+msgid "Scan interval"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Run on"
 msgstr ""
 
 #: katalogus/templates/plugin_container_image.html
@@ -4583,10 +4587,32 @@ msgstr ""
 msgid "Output mime types"
 msgstr ""
 
+#: tools/forms/boefje.py
+msgid "Scan type"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "Interval amount"
+msgstr ""
+
 #: tools/forms/boefje.py
 msgid ""
-"Specify the scanning frequency for this Boefje in minutes. The default is 24 "
-"hours. For example: 5 minutes will let the boefje scan every 5 minutes."
+"Specify the scanning interval for this Boefje. The default is 24 hours. For "
+"example: 5 minutes will let the Boefje scan every 5 minutes."
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "Interval frequency"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "Object creation/change"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid ""
+"Choose weather a the Boefje should run after creating and/or changing an "
+"object. "
 msgstr ""
 
 #: tools/forms/finding_type.py
@@ -4928,6 +4954,12 @@ msgid ""
 "</p> "
 msgstr ""
 
+#: tools/forms/settings.py
+msgid ""
+"Choose when this Boefje will scan objects. It can run on a given interval or "
+"it can run every time an object has been created or changed. "
+msgstr ""
+
 #: tools/forms/settings.py
 msgid "Depth of the tree."
 msgstr ""
diff --git a/rocky/tools/forms/boefje.py b/rocky/tools/forms/boefje.py
index fcf93934e78..6220c7e7624 100644
--- a/rocky/tools/forms/boefje.py
+++ b/rocky/tools/forms/boefje.py
@@ -9,11 +9,21 @@
     BOEFJE_CONTAINER_IMAGE_HELP_TEXT,
     BOEFJE_DESCRIPTION_HELP_TEXT,
     BOEFJE_PRODUCES_HELP_TEXT,
+    BOEFJE_RUN_ON_HELP_TEXT,
     BOEFJE_SCAN_LEVEL_HELP_TEXT,
     BOEFJE_SCHEMA_HELP_TEXT,
 )
 
 OOI_TYPE_CHOICES = sorted((ooi_type.get_object_type(), ooi_type.get_object_type()) for ooi_type in ALL_TYPES)
+SCAN_TYPE_CHOICES = [("interval", "Run on interval, every:"), ("run_on", "Run on object creation/change:")]
+INTERVAL_CHOICES = [
+    ("minutes", "minutes"),
+    ("hours", "hours"),
+    ("days", "days"),
+    ("weeks", "weeks"),
+    ("years", "years"),
+]
+OBJECT_CHANGE_CHOICES = [("create", "Creation"), ("update", "Change"), ("create-update", "Creation and change")]
 
 
 class BoefjeSetupForm(BaseRockyForm):
@@ -46,15 +56,40 @@ class BoefjeSetupForm(BaseRockyForm):
         widget=forms.Select(choices=SCAN_LEVEL.choices),
         help_text=BOEFJE_SCAN_LEVEL_HELP_TEXT,
     )
-    interval = forms.CharField(
+    scan_type = forms.CharField(
         required=False,
-        label=_("Scan frequency"),
+        label=_("Scan type"),
+        widget=forms.RadioSelect(
+            choices=SCAN_TYPE_CHOICES, attrs={"class": "radio-choice", "data-choicegroup": "runon_selector"}
+        ),
+        help_text=BOEFJE_RUN_ON_HELP_TEXT,
+    )
+    interval_number = forms.CharField(
+        required=False,
+        label=_("Interval amount"),
         widget=forms.TextInput(
             attrs={
                 "description": _(
-                    "Specify the scanning frequency for this Boefje in minutes. The default is 24 hours. "
-                    "For example: 5 minutes will let the boefje scan every 5 minutes."
-                )
+                    "Specify the scanning interval for this Boefje. The default is 24 hours. "
+                    "For example: 5 minutes will let the Boefje scan every 5 minutes."
+                ),
+                "class": "runon_selector interval",
             }
         ),
     )
+    interval_frequency = forms.CharField(
+        required=False,
+        label=_("Interval frequency"),
+        widget=forms.Select(choices=INTERVAL_CHOICES, attrs={"class": "runon_selector interval"}),
+    )
+    run_on = forms.CharField(
+        required=False,
+        label=_("Object creation/change"),
+        widget=forms.Select(
+            choices=OBJECT_CHANGE_CHOICES,
+            attrs={
+                "description": _("Choose weather the Boefje should run after creating and/or changing an object. "),
+                "class": "runon_selector run_on",
+            },
+        ),
+    )
diff --git a/rocky/tools/forms/settings.py b/rocky/tools/forms/settings.py
index 88af5cf2f38..cced63c97d2 100644
--- a/rocky/tools/forms/settings.py
+++ b/rocky/tools/forms/settings.py
@@ -99,6 +99,12 @@
     )
 )
 
+BOEFJE_RUN_ON_HELP_TEXT = _(
+    "Choose when this Boefje will scan objects. "
+    "It can run on a given interval or it can run every time an object "
+    "has been created or changed. "
+)
+
 DEPTH_DEFAULT = 9
 DEPTH_MAX = 15
 DEPTH_HELP_TEXT = _("Depth of the tree.")