diff --git a/patterns/1200a58c76686d520c21edb0_resources/resources-op.zip b/patterns/1200a58c76686d520c21edb0_resources/resources-op.zip
index 4f4c5cc..6f1beb7 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 4f4c5cc..6f1beb7 100644
Binary files a/patterns/39ecde9a0d101628fed3e3be_resources/resources-op.zip and b/patterns/39ecde9a0d101628fed3e3be_resources/resources-op.zip differ
diff --git a/patterns/3fd09bb6cfbd34874595c263_labels/labels.zip b/patterns/3fd09bb6cfbd34874595c263_labels/labels.zip
index d1ccdcb..c242b81 100644
Binary files a/patterns/3fd09bb6cfbd34874595c263_labels/labels.zip and b/patterns/3fd09bb6cfbd34874595c263_labels/labels.zip differ
diff --git a/patterns/3fd09bb6cfbd34874595c263_template/webdata.zip b/patterns/3fd09bb6cfbd34874595c263_template/webdata.zip
index 4bf894c..01e6d03 100644
Binary files a/patterns/3fd09bb6cfbd34874595c263_template/webdata.zip and b/patterns/3fd09bb6cfbd34874595c263_template/webdata.zip differ
diff --git a/patterns/6df66943ca713eed2a25d935_labels/labels.zip b/patterns/6df66943ca713eed2a25d935_labels/labels.zip
index d1ccdcb..c242b81 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 4bf894c..01e6d03 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 d1ccdcb..c242b81 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 4bf894c..01e6d03 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 d1ccdcb..c242b81 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 4bf894c..01e6d03 100644
Binary files a/patterns/7518c6cc61e47eec6322ae17_template/webdata.zip and b/patterns/7518c6cc61e47eec6322ae17_template/webdata.zip differ
diff --git a/patterns/816a1456192f974b57418ca9_resources/resources-op.zip b/patterns/816a1456192f974b57418ca9_resources/resources-op.zip
index 4f4c5cc..6f1beb7 100644
Binary files a/patterns/816a1456192f974b57418ca9_resources/resources-op.zip and b/patterns/816a1456192f974b57418ca9_resources/resources-op.zip differ
diff --git a/patterns/DefaultErrorPages_58ece0328f5bf4d78e1a82d2.yml b/patterns/DefaultErrorPages_58ece0328f5bf4d78e1a82d2.yml
index ed7f462..335cfb8 100644
--- a/patterns/DefaultErrorPages_58ece0328f5bf4d78e1a82d2.yml
+++ b/patterns/DefaultErrorPages_58ece0328f5bf4d78e1a82d2.yml
@@ -5,33 +5,64 @@ pattern:
   name: "DefaultErrorPages"
   label: "UTILS"
   properties:
-    filters: "<filter>\n     <filter-name>DefaultErrorFilter</filter-name>\n     <filter-class>ch::nevis::isiweb4::filter::error::ErrorFilter</filter-class>\n\
-      \     <init-param>\n         <param-name>StatusCode</param-name>\n         <param-value>\n\
-      \       403:NevisLogrendConnector_${param.logrendInstancePatternName}:/nevislogrend/errorPages/403.vm?logrendresourcepath=/nevislogrend:keep-status-code\n\
-      \       404:NevisLogrendConnector_${param.logrendInstancePatternName}:/nevislogrend/errorPages/404.vm?logrendresourcepath=/nevislogrend:keep-status-code\n\
-      \       408:NevisLogrendConnector_${param.logrendInstancePatternName}:/nevislogrend/errorPages/timeout.vm?logrendresourcepath=/nevislogrend:keep-status-code\n\
-      \       500:NevisLogrendConnector_${param.logrendInstancePatternName}:/nevislogrend/errorPages/500.vm?logrendresourcepath=/nevislogrend:keep-status-code\n\
-      \       502:NevisLogrendConnector_${param.logrendInstancePatternName}:/nevislogrend/errorPages/502.vm?logrendresourcepath=/nevislogrend:keep-status-code\n\
-      \         </param-value>\n     </init-param>\n     <init-param>\n         <param-name>CheckAcceptHeader</param-name>\n\
-      \         <param-value>true</param-value>\n     </init-param>\n     <init-param>\n\
-      \         <param-name>PlaceHolders</param-name>\n         <param-value>\n  \
-      \           TransferIdHolder:TRANSFER_ID\n             TimestampHolder:TIMESTAMP\n\
-      \         </param-value>\n     </init-param>\n</filter>\n<filter>\n     <filter-name>FallbackErrorFilter</filter-name>\n\
-      \     <filter-class>ch::nevis::isiweb4::filter::error::ErrorFilter</filter-class>\n\
-      \     <init-param>\n         <param-name>StatusCode</param-name>\n         <param-value>\n\
-      \            500:file:/resources/errorPages/500.html:reset-header:reset-status-code\n\
-      \            502:file:/resources/errorPages/502.html:reset-header:reset-status-code\n\
-      \            503:file:/resources/errorPages/500.html:reset-header:reset-status-code\n\
-      \            504:file:/resources/errorPages/500.html:reset-header:reset-status-code\n\
-      \         </param-value>\n     </init-param>\n     <init-param>\n         <param-name>CheckAcceptHeader</param-name>\n\
-      \         <param-value>true</param-value>\n     </init-param>\n     <init-param>\n\
-      \         <param-name>PlaceHolders</param-name>\n         <param-value>\n  \
-      \           TransferIdHolder:TRANSFER_ID\n             TimestampHolder:TIMESTAMP\n\
-      \         </param-value>\n     </init-param>\n</filter>\n<filter-mapping>\n\
-      \   <filter-name>DefaultErrorFilter</filter-name>\n   <url-pattern>/*</url-pattern>\n\
-      </filter-mapping>\n<filter-mapping>\n   <filter-name>FallbackErrorFilter</filter-name>\n\
-      \   <servlet-name>NevisLogrendConnector_${param.logrendInstancePatternName}</servlet-name>\n\
-      </filter-mapping>\n"
+    filters: |
+      <filter>
+           <filter-name>DefaultErrorFilter</filter-name>
+           <filter-class>ch::nevis::isiweb4::filter::error::ErrorFilter</filter-class>
+           <init-param>
+               <param-name>StatusCode</param-name>
+               <param-value>
+             403:NevisLogrendConnector_${param.logrendInstancePatternName}:/nevislogrend/webdata/template/403.vm?logrendresourcepath=/nevislogrend:keep-status-code
+             404:NevisLogrendConnector_${param.logrendInstancePatternName}:/nevislogrend/webdata/template/404.vm?logrendresourcepath=/nevislogrend:keep-status-code
+             408:NevisLogrendConnector_${param.logrendInstancePatternName}:/nevislogrend/webdata/template/timeout.vm?logrendresourcepath=/nevislogrend:keep-status-code
+             500:NevisLogrendConnector_${param.logrendInstancePatternName}:/nevislogrend/webdata/template/500.vm?logrendresourcepath=/nevislogrend:keep-status-code
+             502:NevisLogrendConnector_${param.logrendInstancePatternName}:/nevislogrend/webdata/template/502.vm?logrendresourcepath=/nevislogrend:keep-status-code
+               </param-value>
+           </init-param>
+           <init-param>
+               <param-name>CheckAcceptHeader</param-name>
+               <param-value>true</param-value>
+           </init-param>
+           <init-param>
+               <param-name>PlaceHolders</param-name>
+               <param-value>
+                   TransferIdHolder:TRANSFER_ID
+                   TimestampHolder:TIMESTAMP
+               </param-value>
+           </init-param>
+      </filter>
+      <filter>
+           <filter-name>FallbackErrorFilter</filter-name>
+           <filter-class>ch::nevis::isiweb4::filter::error::ErrorFilter</filter-class>
+           <init-param>
+               <param-name>StatusCode</param-name>
+               <param-value>
+                  500:file:/resources/errorPages/500.html:reset-header:reset-status-code
+                  502:file:/resources/errorPages/502.html:reset-header:reset-status-code
+                  503:file:/resources/errorPages/500.html:reset-header:reset-status-code
+                  504:file:/resources/errorPages/500.html:reset-header:reset-status-code
+               </param-value>
+           </init-param>
+           <init-param>
+               <param-name>CheckAcceptHeader</param-name>
+               <param-value>true</param-value>
+           </init-param>
+           <init-param>
+               <param-name>PlaceHolders</param-name>
+               <param-value>
+                   TransferIdHolder:TRANSFER_ID
+                   TimestampHolder:TIMESTAMP
+               </param-value>
+           </init-param>
+      </filter>
+      <filter-mapping>
+         <filter-name>DefaultErrorFilter</filter-name>
+         <url-pattern>/*</url-pattern>
+      </filter-mapping>
+      <filter-mapping>
+         <filter-name>FallbackErrorFilter</filter-name>
+         <servlet-name>NevisLogrendConnector_${param.logrendInstancePatternName}</servlet-name>
+      </filter-mapping>
     filterMappings: "manual"
     phase: "START"
     parameters: "logrendInstancePatternName: nevisLogrend"
diff --git a/variables.yml b/variables.yml
index c840413..2800bd1 100644
--- a/variables.yml
+++ b/variables.yml
@@ -269,33 +269,42 @@ variables:
     parameters:
       required: true
       syntax: "XML"
-    value: "<bean id=\"pruneOperationsAccountsJob\"  class=\"org.springframework.scheduling.quartz.JobDetailFactoryBean\"\
-      >\n    <property name=\"description\" value=\"Archive and delete obsolete operations\
-      \ accounts\"/>\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=\"\
-      -1\"/>\n                    <entry key=\"considerUsersNeverLoggedIn\" value=\"\
-      true\"/>\n                    <entry key=\"sendWarning\" value=\"false\"/>\n\
-      \                    <entry key=\"daysGracePeriod\" value=\"1\"/>\n        \
-      \            <entry key=\"daysStatusDisabled\" value=\"30\"/>\n            \
-      \        <entry key=\"daysStatusArchived\" value=\"335\"/>\n               \
-      \     <entry key=\"disableOutdatedUsers\" value=\"true\"/>\n               \
-      \     <entry key=\"disableNotYetActiveUsers\" value=\"false\"/>\n          \
-      \          <entry key=\"excludeTechnicalUsers\" value=\"true\"/>\n         \
-      \           <entry key=\"restrictToClients\" value=\"d9a334a6-b6f5-4982-a24e-13ae095a60fa\"\
-      />\n                </map>\n            </constructor-arg>\n        </bean>\n\
-      \    </property>\n</bean>\n"
+    value: |
+      <bean id="pruneOperationsAccountsJob"  class="org.springframework.scheduling.quartz.JobDetailFactoryBean">
+          <property name="description" value="Archive and delete obsolete operations accounts"/>
+          <property name="jobClass" value="ch.nevis.idm.batch.jobs.UpdateUserStateJob"/>
+          <property name="durability" value="true"/>
+          <property name="jobDataMap">
+              <bean class="org.quartz.JobDataMap">
+                  <constructor-arg>
+                      <map>
+                          <entry key="daysNoActivity" value="-1"/>
+                          <entry key="considerUsersNeverLoggedIn" value="true"/>
+                          <entry key="sendWarning" value="false"/>
+                          <entry key="daysGracePeriod" value="1"/>
+                          <entry key="daysStatusDisabled" value="30"/>
+                          <entry key="daysStatusArchived" value="335"/>
+                          <entry key="disableOutdatedUsers" value="true"/>
+                          <entry key="disableNotYetActiveUsers" value="false"/>
+                          <entry key="excludeTechnicalUsers" value="true"/>
+                          <entry key="restrictToClients" value="d9a334a6-b6f5-4982-a24e-13ae095a60fa"/>
+                      </map>
+                  </constructor-arg>
+              </bean>
+          </property>
+      </bean>
     requireOverloading: false
   idm-prune-operations-accounts-job-triggers:
     className: "ch.nevis.admin.v4.plugin.base.generation.property.TextProperty"
     parameters:
       required: false
       syntax: "XML"
-    value: "<bean id=\"pruneOperationsAccountsJobTrigger\" class=\"org.springframework.scheduling.quartz.CronTriggerFactoryBean\"\
-      >\n    <property name=\"description\" value=\"Archive and delete obsolete operations\
-      \ accounts\"/>\n    <property name=\"jobDetail\" ref=\"pruneOperationsAccountsJob\"\
-      />\n    <property name=\"cronExpression\" value=\"30 1 0 * * ?\"/>\n</bean>"
+    value: |-
+      <bean id="pruneOperationsAccountsJobTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+          <property name="description" value="Archive and delete obsolete operations accounts"/>
+          <property name="jobDetail" ref="pruneOperationsAccountsJob"/>
+          <property name="cronExpression" value="30 1 0 * * ?"/>
+      </bean>
     requireOverloading: false
   idm_db-application-role:
     className: "ch.nevis.admin.v4.plugin.base.generation.property.SimpleTextProperty"
@@ -785,10 +794,11 @@ variables:
     parameters:
       required: false
       syntax: "YAML"
-    value: "op.atb.ssoUrl: https://trustbroker.agov-d.azure.adnovum.net/adfs/ls\n\
-      op.onboarding.issuer: https://op.agov-d.azure.adnovum.net/AUTH/ONBOARDING\n\
-      op.onboarding.consumerURL: https://op.agov-d.azure.adnovum.net/AUTH/ONBOARDING\n\
-      op.ident.consumerURL: https://ident.agov-d.azure.adnovum.net/process"
+    value: |-
+      op.atb.ssoUrl: https://trustbroker.agov-d.azure.adnovum.net/adfs/ls
+      op.onboarding.issuer: https://op.agov-d.azure.adnovum.net/AUTH/ONBOARDING
+      op.onboarding.consumerURL: https://op.agov-d.azure.adnovum.net/AUTH/ONBOARDING
+      op.ident.consumerURL: https://ident.agov-d.azure.adnovum.net/process
     requireOverloading: true
   operations-admin-signer-pem-key-store-private-key-passphrase:
     className: "ch.nevis.admin.v4.plugin.base.generation.property.SimpleTextProperty"
@@ -966,35 +976,42 @@ variables:
     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>"
+    value: |-
+      <bean id="pruneAgovAccountsJob"  class="org.springframework.scheduling.quartz.JobDetailFactoryBean">
+          <property name="description" value="Archive and delete obsolete AGOV accounts (100d no activity)"/>
+          <property name="jobClass" value="ch.nevis.idm.batch.jobs.UpdateUserStateJob"/>
+          <property name="durability" value="true"/>
+          <property name="jobDataMap">
+              <bean class="org.quartz.JobDataMap">
+                  <constructor-arg>
+                      <map>
+                          <entry key="daysNoActivity" value="100"/>
+                          <entry key="neverLoggedInDaysNoActivity" value="100"/>
+                          <entry key="considerUsersNeverLoggedIn" value="true"/>
+                          <entry key="sendWarning" value="false"/>
+                          <entry key="daysGracePeriod" value="1"/>
+                          <entry key="daysStatusDisabled" value="100"/>
+                          <entry key="daysStatusArchived" value="10"/>
+                          <entry key="disableOutdatedUsers" value="true"/>
+                          <entry key="disableNotYetActiveUsers" value="false"/>
+                          <entry key="excludeTechnicalUsers" value="true"/>
+                          <entry key="restrictToClients" value="cfa9c9b9-119f-4dff-9bb8-86d7c0cf2720"/>
+                      </map>
+                  </constructor-arg>
+              </bean>
+          </property>
+      </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>"
+    value: |-
+      <bean id="pruneAgovAccountsJobTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+          <property name="description" value="Archive and delete obsolete AGOV accounts (100d no activity)"/>
+          <property name="jobDetail" ref="pruneAgovAccountsJob"/>
+      </bean>
     requireOverloading: true
   virtual_host_agovident-frontend-addresses:
     className: "ch.nevis.admin.v4.plugin.base.generation.property.URLProperty"