diff --git a/patterns/1200a58c76686d520c21edb0_resources/resources-op.zip b/patterns/1200a58c76686d520c21edb0_resources/resources-op.zip
index 1c5e4d7..0f5f898 100644
Binary files a/patterns/1200a58c76686d520c21edb0_resources/resources-op.zip and b/patterns/1200a58c76686d520c21edb0_resources/resources-op.zip differ
diff --git a/patterns/39ecde9a0d101628fed3e3be_resources/resources-op.zip b/patterns/39ecde9a0d101628fed3e3be_resources/resources-op.zip
index 1c5e4d7..0f5f898 100644
Binary files a/patterns/39ecde9a0d101628fed3e3be_resources/resources-op.zip and b/patterns/39ecde9a0d101628fed3e3be_resources/resources-op.zip differ
diff --git a/patterns/6df66943ca713eed2a25d935_labels/labels.zip b/patterns/6df66943ca713eed2a25d935_labels/labels.zip
index a7d7c14..a220271 100644
Binary files a/patterns/6df66943ca713eed2a25d935_labels/labels.zip and b/patterns/6df66943ca713eed2a25d935_labels/labels.zip differ
diff --git a/patterns/6df66943ca713eed2a25d935_template/webdata.zip b/patterns/6df66943ca713eed2a25d935_template/webdata.zip
index 38b8d20..45af239 100644
Binary files a/patterns/6df66943ca713eed2a25d935_template/webdata.zip and b/patterns/6df66943ca713eed2a25d935_template/webdata.zip differ
diff --git a/patterns/6f9c9f982dcc7ef59a34f1f7_labels/labels.zip b/patterns/6f9c9f982dcc7ef59a34f1f7_labels/labels.zip
index a7d7c14..a220271 100644
Binary files a/patterns/6f9c9f982dcc7ef59a34f1f7_labels/labels.zip and b/patterns/6f9c9f982dcc7ef59a34f1f7_labels/labels.zip differ
diff --git a/patterns/6f9c9f982dcc7ef59a34f1f7_template/webdata.zip b/patterns/6f9c9f982dcc7ef59a34f1f7_template/webdata.zip
index 38b8d20..45af239 100644
Binary files a/patterns/6f9c9f982dcc7ef59a34f1f7_template/webdata.zip and b/patterns/6f9c9f982dcc7ef59a34f1f7_template/webdata.zip differ
diff --git a/patterns/7518c6cc61e47eec6322ae17_labels/labels.zip b/patterns/7518c6cc61e47eec6322ae17_labels/labels.zip
index a7d7c14..a220271 100644
Binary files a/patterns/7518c6cc61e47eec6322ae17_labels/labels.zip and b/patterns/7518c6cc61e47eec6322ae17_labels/labels.zip differ
diff --git a/patterns/7518c6cc61e47eec6322ae17_template/webdata.zip b/patterns/7518c6cc61e47eec6322ae17_template/webdata.zip
index 38b8d20..45af239 100644
Binary files a/patterns/7518c6cc61e47eec6322ae17_template/webdata.zip and b/patterns/7518c6cc61e47eec6322ae17_template/webdata.zip differ
diff --git a/patterns/IDM_Default_Prune_History_Job_0957497767812057fbf138cf.yml b/patterns/IDM_Default_Prune_History_Job_0957497767812057fbf138cf.yml
new file mode 100644
index 0000000..30b1d98
--- /dev/null
+++ b/patterns/IDM_Default_Prune_History_Job_0957497767812057fbf138cf.yml
@@ -0,0 +1,10 @@
+schemaVersion: "1.0"
+pattern:
+  id: "0957497767812057fbf138cf"
+  className: "ch.nevis.admin.v4.plugin.nevisidm.patterns.NevisIDMPruneHistoryJob"
+  name: "IDM Default Prune History Job"
+  label: "Batch"
+  properties:
+    retention: "var://idm-history-default-retention-period"
+    cronExpression: "var://idm-history-default-prune-history-job-cron-expression"
+    skipList: "var://idm-history-default-retention-skip-list"
diff --git a/patterns/IDM_Login_Event_Prune_History_Job_d4c123d7dd5d7126ff7a03b0.yml b/patterns/IDM_Login_Event_Prune_History_Job_d4c123d7dd5d7126ff7a03b0.yml
new file mode 100644
index 0000000..21cc713
--- /dev/null
+++ b/patterns/IDM_Login_Event_Prune_History_Job_d4c123d7dd5d7126ff7a03b0.yml
@@ -0,0 +1,10 @@
+schemaVersion: "1.0"
+pattern:
+  id: "d4c123d7dd5d7126ff7a03b0"
+  className: "ch.nevis.admin.v4.plugin.nevisidm.patterns.NevisIDMPruneHistoryJob"
+  name: "IDM Login Event Prune History Job"
+  label: "Batch"
+  properties:
+    retention: "var://idm-history-login-event-retention-period"
+    cronExpression: "var://idm-history-login-event-prune-history-job-cron-expression"
+    skipList: "var://idm-history-login-event-retention-skip-list"
diff --git a/patterns/IDM_Prune_History_Job_0957497767812057fbf138cf.yml b/patterns/IDM_Prune_History_Job_0957497767812057fbf138cf.yml
deleted file mode 100644
index 987631f..0000000
--- a/patterns/IDM_Prune_History_Job_0957497767812057fbf138cf.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-schemaVersion: "1.0"
-pattern:
-  id: "0957497767812057fbf138cf"
-  className: "ch.nevis.admin.v4.plugin.nevisidm.patterns.NevisIDMPruneHistoryJob"
-  name: "IDM Prune History Job"
-  label: "Batch"
-  properties: {}
diff --git a/patterns/TEST_IDM_Prune_AGOV_Accounts_Job_17562935f23ceca216bd5b99.yml b/patterns/TEST_IDM_Prune_AGOV_Accounts_Job_17562935f23ceca216bd5b99.yml
new file mode 100644
index 0000000..f1bc5da
--- /dev/null
+++ b/patterns/TEST_IDM_Prune_AGOV_Accounts_Job_17562935f23ceca216bd5b99.yml
@@ -0,0 +1,8 @@
+schemaVersion: "1.0"
+pattern:
+  id: "17562935f23ceca216bd5b99"
+  className: "ch.nevis.admin.v4.plugin.nevisidm.patterns.NevisIDMGenericBatchJob"
+  name: "TEST IDM Prune AGOV Accounts Job"
+  properties:
+    job: "var://test-idm-prune-agov-accounts-job-jobs"
+    trigger: "var://test-idm-prune-agov-accounts-job-triggers"
diff --git a/patterns/nevisIDM_admin_ba7c7a3b091df0c4b8ba0bb2.yml b/patterns/nevisIDM_admin_ba7c7a3b091df0c4b8ba0bb2.yml
index 8ef64ef..6fbf980 100644
--- a/patterns/nevisIDM_admin_ba7c7a3b091df0c4b8ba0bb2.yml
+++ b/patterns/nevisIDM_admin_ba7c7a3b091df0c4b8ba0bb2.yml
@@ -51,3 +51,4 @@ pattern:
     - "pattern://2d5614b389904a87cbe05fb0"
     - "pattern://1960dfb9b110a6d07bcd04b9"
     - "pattern://f4e909fcaf0ae3f6effb28ae"
+    - "pattern://17562935f23ceca216bd5b99"
diff --git a/patterns/nevisIDM_batch_641ac4edf0c17383d3c0ea38.yml b/patterns/nevisIDM_batch_641ac4edf0c17383d3c0ea38.yml
index 75d9149..d1c8beb 100644
--- a/patterns/nevisIDM_batch_641ac4edf0c17383d3c0ea38.yml
+++ b/patterns/nevisIDM_batch_641ac4edf0c17383d3c0ea38.yml
@@ -27,3 +27,4 @@ pattern:
     - "pattern://50d6c91ace65f52fa56d7113"
     - "pattern://f4e909fcaf0ae3f6effb28ae"
     - "pattern://b4ede97e934bb0fc17c60976"
+    - "pattern://d4c123d7dd5d7126ff7a03b0"
diff --git a/variables.yml b/variables.yml
index b81d72f..d0fa773 100644
--- a/variables.yml
+++ b/variables.yml
@@ -167,6 +167,50 @@ variables:
     - database.connection.pool.size.max: "10"
     - database.transaction.timeout: "60"
     requireOverloading: true
+  idm-history-default-prune-history-job-cron-expression:
+    className: "ch.nevis.admin.v4.plugin.base.generation.property.SimpleTextProperty"
+    parameters:
+      minRequired: 1
+      maxAllowed: 1
+    value: "0 0 0 * * ?"
+    requireOverloading: true
+  idm-history-default-retention-period:
+    className: "ch.nevis.admin.v4.plugin.base.generation.property.DurationProperty"
+    parameters:
+      min: "1d"
+      max: "1024d"
+      required: true
+    value: "365d"
+    requireOverloading: true
+  idm-history-default-retention-skip-list:
+    className: "ch.nevis.admin.v4.plugin.base.generation.property.SimpleTextProperty"
+    parameters:
+      minRequired: 0
+      maxAllowed: 1
+    value: "tidma_user_login_info_v"
+    requireOverloading: true
+  idm-history-login-event-prune-history-job-cron-expression:
+    className: "ch.nevis.admin.v4.plugin.base.generation.property.SimpleTextProperty"
+    parameters:
+      minRequired: 1
+      maxAllowed: 1
+    value: "0 0 0 * * ?"
+    requireOverloading: true
+  idm-history-login-event-retention-period:
+    className: "ch.nevis.admin.v4.plugin.base.generation.property.DurationProperty"
+    parameters:
+      min: "1d"
+      max: "1024d"
+      required: true
+    value: "100d"
+    requireOverloading: true
+  idm-history-login-event-retention-skip-list:
+    className: "ch.nevis.admin.v4.plugin.base.generation.property.SimpleTextProperty"
+    parameters:
+      minRequired: 0
+      maxAllowed: 1
+    value: "tidma_user_v"
+    requireOverloading: true
   idm_db-application-role:
     className: "ch.nevis.admin.v4.plugin.base.generation.property.SimpleTextProperty"
     parameters:
@@ -780,6 +824,41 @@ variables:
       minRequired: 0
     value: null
     requireOverloading: true
+  test-idm-prune-agov-accounts-job-jobs:
+    className: "ch.nevis.admin.v4.plugin.base.generation.property.TextProperty"
+    parameters:
+      required: true
+      syntax: "XML"
+    value: "<bean id=\"pruneAgovAccountsJob\"  class=\"org.springframework.scheduling.quartz.JobDetailFactoryBean\"\
+      >\n    <property name=\"description\" value=\"Archive and delete obsolete AGOV\
+      \ accounts (100d no activity)\"/>\n    <property name=\"jobClass\" value=\"\
+      ch.nevis.idm.batch.jobs.UpdateUserStateJob\"/>\n    <property name=\"durability\"\
+      \ value=\"true\"/>\n    <property name=\"jobDataMap\">\n        <bean class=\"\
+      org.quartz.JobDataMap\">\n            <constructor-arg>\n                <map>\n\
+      \                    <entry key=\"daysNoActivity\" value=\"100\"/>\n       \
+      \             <entry key=\"neverLoggedInDaysNoActivity\" value=\"100\"/>\n \
+      \                   <entry key=\"considerUsersNeverLoggedIn\" value=\"true\"\
+      />\n                    <entry key=\"sendWarning\" value=\"false\"/>\n     \
+      \               <entry key=\"daysGracePeriod\" value=\"1\"/>\n             \
+      \       <entry key=\"daysStatusDisabled\" value=\"100\"/>\n                \
+      \    <entry key=\"daysStatusArchived\" value=\"10\"/>\n                    <entry\
+      \ key=\"disableOutdatedUsers\" value=\"true\"/>\n                    <entry\
+      \ key=\"disableNotYetActiveUsers\" value=\"false\"/>\n                    <entry\
+      \ key=\"excludeTechnicalUsers\" value=\"true\"/>\n                    <entry\
+      \ key=\"restrictToClients\" value=\"cfa9c9b9-119f-4dff-9bb8-86d7c0cf2720\"/>\n\
+      \                </map>\n            </constructor-arg>\n        </bean>\n \
+      \   </property>\n</bean>"
+    requireOverloading: true
+  test-idm-prune-agov-accounts-job-triggers:
+    className: "ch.nevis.admin.v4.plugin.base.generation.property.TextProperty"
+    parameters:
+      required: false
+      syntax: "XML"
+    value: "<bean id=\"pruneAgovAccountsJobTrigger\" class=\"org.springframework.scheduling.quartz.CronTriggerFactoryBean\"\
+      >\n    <property name=\"description\" value=\"Archive and delete obsolete AGOV\
+      \ accounts (100d no activity)\"/>\n    <property name=\"jobDetail\" ref=\"pruneAgovAccountsJob\"\
+      />\n</bean>"
+    requireOverloading: true
   virtual_host_idmadmin-frontend-addresses:
     className: "ch.nevis.admin.v4.plugin.base.generation.property.URLProperty"
     parameters: