diff --git a/kontor-spring/src/main/frontend/generated/flow/generated-flow-imports.js b/kontor-spring/src/main/frontend/generated/flow/generated-flow-imports.js
index 2600834..874dc01 100644
--- a/kontor-spring/src/main/frontend/generated/flow/generated-flow-imports.js
+++ b/kontor-spring/src/main/frontend/generated/flow/generated-flow-imports.js
@@ -5,29 +5,29 @@ import 'Frontend/generated/jar-resources/ReactRouterOutletElement.tsx';
 
 const loadOnDemand = (key) => {
   const pending = [];
-  if (key === '81bbe2e11b6af26d0d292e2e18bde37546d5b9ec24f4f4f78df2bc9f9c21f431') {
-    pending.push(import('./chunks/chunk-ba68801837253f4860e3f4374e9ae9e48ccba4ca6110cac47de37e40d7b6199e.js'));
+  if (key === 'c5f987a4896c791d13aeb6a03a4783ff03df304750a7db930a18d399dba31509') {
+    pending.push(import('./chunks/chunk-7eb0e92a81bb7e9cb5e0c25a28ae3459e5223c6322ff3569292a66f45a9990ae.js'));
   }
-  if (key === '8904207b9d538b9eedfaaefd8e82d3415de8513bda9d6bb76f4012f0f336d200') {
-    pending.push(import('./chunks/chunk-34d02800587f0d3950a0cf1f566793c706accc702ca93d2f51ab25f74d29bd84.js'));
-  }
-  if (key === '96ecac798fbbe91ef146ac4a25f5c31827427ca0f106ba66e63fc1fd6c27b83d') {
-    pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
-  }
-  if (key === 'c0816c2bfaa97d6f3e7eea83c5478186457bdc79cfe3f284c42e192d68607157') {
+  if (key === '83045a9760ea76fd534ed71ed553dc7cf2595a5d697e3c7bc55470d219770d05') {
     pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
   }
   if (key === '58cc18f5518623050c6a99d327dd540140b9b0dca851a76a70e688291f661e11') {
     pending.push(import('./chunks/chunk-94486ac490d7aebdfb2696122da529dc74cba54f50b75f3f737368bd86850d36.js'));
   }
-  if (key === '83045a9760ea76fd534ed71ed553dc7cf2595a5d697e3c7bc55470d219770d05') {
+  if (key === 'b4afd0c0906e26b51836d41720e1b8d91a7cacf0fd42e089f1e0fbc2ee27a5bb') {
     pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
   }
-  if (key === 'e9df10b3be58513bb6452e4dbdce31e0b1dc33868fbba54ee72e82089cf39adf') {
-    pending.push(import('./chunks/chunk-34d02800587f0d3950a0cf1f566793c706accc702ca93d2f51ab25f74d29bd84.js'));
+  if (key === '96ecac798fbbe91ef146ac4a25f5c31827427ca0f106ba66e63fc1fd6c27b83d') {
+    pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
   }
-  if (key === '39b4a07b2b07a780f8ac9d2f7cc855e3b78ec60465d9d808690466c1f0bea792') {
-    pending.push(import('./chunks/chunk-9067a52cbc57d972c6155501cef5bd27a816f0c7adf6390a603c7b4e9bbddce3.js'));
+  if (key === '2140ca6af7e9a5ff94d8a66b6e5a23e6d184ef7901ca73d33b3c30f74f94708a') {
+    pending.push(import('./chunks/chunk-eab035454a058f437d12e5ccf64ef647181029b965d466c829f5a569b2865dd3.js'));
+  }
+  if (key === '81bbe2e11b6af26d0d292e2e18bde37546d5b9ec24f4f4f78df2bc9f9c21f431') {
+    pending.push(import('./chunks/chunk-ba68801837253f4860e3f4374e9ae9e48ccba4ca6110cac47de37e40d7b6199e.js'));
+  }
+  if (key === 'c0816c2bfaa97d6f3e7eea83c5478186457bdc79cfe3f284c42e192d68607157') {
+    pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
   }
   if (key === '803ed44611ffeb1bcb1f604f267f09af48ef8a5bc8d765e481b67ed59f9b880a') {
     pending.push(import('./chunks/chunk-5f54f3be0c0d908c0477e60450f72fbb60bfa31e84e7d18b39841a003d995f86.js'));
@@ -35,83 +35,83 @@ const loadOnDemand = (key) => {
   if (key === '9f40817b690e11a5b23a3159bb774f15430c23768f26dc0d15efccc3d65223ac') {
     pending.push(import('./chunks/chunk-c2a7e008275ccefd2b71f714af29d0186f49edb012ac8081cb81d0a896594da6.js'));
   }
-  if (key === '391ac9fb4bd95bc899c5911c48a6f3b549b118923653444f5ab50acddfb6f291') {
-    pending.push(import('./chunks/chunk-7eb0e92a81bb7e9cb5e0c25a28ae3459e5223c6322ff3569292a66f45a9990ae.js'));
-  }
-  if (key === '1ac8bd8d734d2603947b1db0616ea4dae4ce691a5264f5c9aeafcaa897e0a872') {
-    pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
-  }
-  if (key === 'e5db1fd1f39047ab2857e9ef118681c3f831f39efbbb2a6f000e9475b77444e5') {
-    pending.push(import('./chunks/chunk-94486ac490d7aebdfb2696122da529dc74cba54f50b75f3f737368bd86850d36.js'));
-  }
-  if (key === '92a567041312ea4c7faa4dd5bcc74f73cd3b16dd721624d0bc68d1704138abe5') {
-    pending.push(import('./chunks/chunk-4f16ee624545500a5dde991be4f07a661d86951bbc2c07a010daabbd423b1909.js'));
-  }
-  if (key === 'bfac19b5aab9cd5a47ff4a66f2a839ebbb4889867824be809c5dc3a3d47f94b8') {
+  if (key === '89c2914ed5d19860240c0c1d3dba174616dc452c4ba8ae039f016cf9592e9432') {
     pending.push(import('./chunks/chunk-7eb0e92a81bb7e9cb5e0c25a28ae3459e5223c6322ff3569292a66f45a9990ae.js'));
   }
   if (key === 'a886fd99e05dd2c5ce3e4b643dc8d6d29189dee784fa78678d8ab4fcb89216c0') {
     pending.push(import('./chunks/chunk-4643e5b30878e982c301927c78b86af508e91d91560341ef83fa0e6bf79dedee.js'));
   }
-  if (key === 'becc589ccd4f7ac5e6f13c45eecc05f61d67ce57f585f1655800354ff4b55f3c') {
-    pending.push(import('./chunks/chunk-c2a7e008275ccefd2b71f714af29d0186f49edb012ac8081cb81d0a896594da6.js'));
+  if (key === 'a4eeeab53770801e478b15e6b179e5689afd43fc753f347e0c51ce934bd28a6c') {
+    pending.push(import('./chunks/chunk-0980a344d761e100f78a8df513a682bdcc702314eb249c64b972cbe64fc2a813.js'));
+  }
+  if (key === '391ac9fb4bd95bc899c5911c48a6f3b549b118923653444f5ab50acddfb6f291') {
+    pending.push(import('./chunks/chunk-7eb0e92a81bb7e9cb5e0c25a28ae3459e5223c6322ff3569292a66f45a9990ae.js'));
   }
   if (key === '0ca48a0e12f1dbf4945f761a93a7df202b2908327a63c52f2f060559c2bcc7f0') {
     pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
   }
-  if (key === '2140ca6af7e9a5ff94d8a66b6e5a23e6d184ef7901ca73d33b3c30f74f94708a') {
-    pending.push(import('./chunks/chunk-eab035454a058f437d12e5ccf64ef647181029b965d466c829f5a569b2865dd3.js'));
+  if (key === '92a567041312ea4c7faa4dd5bcc74f73cd3b16dd721624d0bc68d1704138abe5') {
+    pending.push(import('./chunks/chunk-4f16ee624545500a5dde991be4f07a661d86951bbc2c07a010daabbd423b1909.js'));
   }
-  if (key === '89c2914ed5d19860240c0c1d3dba174616dc452c4ba8ae039f016cf9592e9432') {
+  if (key === 'e9df10b3be58513bb6452e4dbdce31e0b1dc33868fbba54ee72e82089cf39adf') {
+    pending.push(import('./chunks/chunk-34d02800587f0d3950a0cf1f566793c706accc702ca93d2f51ab25f74d29bd84.js'));
+  }
+  if (key === 'becc589ccd4f7ac5e6f13c45eecc05f61d67ce57f585f1655800354ff4b55f3c') {
+    pending.push(import('./chunks/chunk-c2a7e008275ccefd2b71f714af29d0186f49edb012ac8081cb81d0a896594da6.js'));
+  }
+  if (key === 'bfac19b5aab9cd5a47ff4a66f2a839ebbb4889867824be809c5dc3a3d47f94b8') {
     pending.push(import('./chunks/chunk-7eb0e92a81bb7e9cb5e0c25a28ae3459e5223c6322ff3569292a66f45a9990ae.js'));
   }
-  if (key === 'ffd87f879398d3b6942e852eda9b64e28a124c8a61938c867efb360a5cf1d32e') {
-    pending.push(import('./chunks/chunk-7eb0e92a81bb7e9cb5e0c25a28ae3459e5223c6322ff3569292a66f45a9990ae.js'));
-  }
-  if (key === 'c5f987a4896c791d13aeb6a03a4783ff03df304750a7db930a18d399dba31509') {
-    pending.push(import('./chunks/chunk-7eb0e92a81bb7e9cb5e0c25a28ae3459e5223c6322ff3569292a66f45a9990ae.js'));
-  }
-  if (key === '3665d7598c9ed4112997a0493fb890edf38d23d3bd9fcb0eb09bf3e045f5228b') {
-    pending.push(import('./chunks/chunk-7eb0e92a81bb7e9cb5e0c25a28ae3459e5223c6322ff3569292a66f45a9990ae.js'));
-  }
-  if (key === '4e76ad4411fbf58731cdad95d28e6fe0057fb4a97ffd54f193e52b111462552d') {
-    pending.push(import('./chunks/chunk-ba68801837253f4860e3f4374e9ae9e48ccba4ca6110cac47de37e40d7b6199e.js'));
+  if (key === '1ac8bd8d734d2603947b1db0616ea4dae4ce691a5264f5c9aeafcaa897e0a872') {
+    pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
   }
   if (key === '3e87cbb0d40d50da9c3b69d0dada85fe9b7f2f4bae2b79c8f0408a798b120549') {
     pending.push(import('./chunks/chunk-5e457c2d02d56b468106fc6b3ad37f1215d95af443e88a25314d583049fa7ada.js'));
   }
-  if (key === 'ac7af13a0805d3ce8a287e9d860521c82aaf55d2c448ce3f62a85d44216a8189') {
-    pending.push(import('./chunks/chunk-7eb0e92a81bb7e9cb5e0c25a28ae3459e5223c6322ff3569292a66f45a9990ae.js'));
+  if (key === 'e5db1fd1f39047ab2857e9ef118681c3f831f39efbbb2a6f000e9475b77444e5') {
+    pending.push(import('./chunks/chunk-94486ac490d7aebdfb2696122da529dc74cba54f50b75f3f737368bd86850d36.js'));
   }
-  if (key === 'a4eeeab53770801e478b15e6b179e5689afd43fc753f347e0c51ce934bd28a6c') {
-    pending.push(import('./chunks/chunk-0980a344d761e100f78a8df513a682bdcc702314eb249c64b972cbe64fc2a813.js'));
+  if (key === '8904207b9d538b9eedfaaefd8e82d3415de8513bda9d6bb76f4012f0f336d200') {
+    pending.push(import('./chunks/chunk-34d02800587f0d3950a0cf1f566793c706accc702ca93d2f51ab25f74d29bd84.js'));
+  }
+  if (key === '4e76ad4411fbf58731cdad95d28e6fe0057fb4a97ffd54f193e52b111462552d') {
+    pending.push(import('./chunks/chunk-ba68801837253f4860e3f4374e9ae9e48ccba4ca6110cac47de37e40d7b6199e.js'));
+  }
+  if (key === '53ff1588255d7e5486eb67452c8d9c43baea0eecd9bd509fd7f0c55b3cccaa0d') {
+    pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
+  }
+  if (key === '3665d7598c9ed4112997a0493fb890edf38d23d3bd9fcb0eb09bf3e045f5228b') {
+    pending.push(import('./chunks/chunk-7eb0e92a81bb7e9cb5e0c25a28ae3459e5223c6322ff3569292a66f45a9990ae.js'));
   }
   if (key === 'dca37e6961f625182e78a722a61c0eb9b8a2357b5e787fe616fe5993c2db5133') {
     pending.push(import('./chunks/chunk-dbbf8c73fe9c2c76fb9306f96bfa7ff293eff804705670e651ac024bea9551bd.js'));
   }
+  if (key === 'ffd87f879398d3b6942e852eda9b64e28a124c8a61938c867efb360a5cf1d32e') {
+    pending.push(import('./chunks/chunk-7eb0e92a81bb7e9cb5e0c25a28ae3459e5223c6322ff3569292a66f45a9990ae.js'));
+  }
   if (key === '5d710852587ce9ebabfac9ed950f6b11bc3a87d96860d4efdfb61dab7ae54091') {
     pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
   }
   if (key === '2b0ca0e51ded6027d3f9e464513210d5503ab2a9bc532de5cfc81d78a58f422f') {
     pending.push(import('./chunks/chunk-c2a7e008275ccefd2b71f714af29d0186f49edb012ac8081cb81d0a896594da6.js'));
   }
+  if (key === '4e356c0939a28ab8766b0375ca6cb478b6163eb9ad80745a9e2f2fc80997b6a2') {
+    pending.push(import('./chunks/chunk-82d1654bda3835e43a2a0c9a2e52925f12dc4a2fcd20b5f40603dbbe6eb1ff23.js'));
+  }
   if (key === '28b5e9145505152a4dbd9600977b8177d3a161906581ca5a1a923affc812a761') {
     pending.push(import('./chunks/chunk-5e457c2d02d56b468106fc6b3ad37f1215d95af443e88a25314d583049fa7ada.js'));
   }
+  if (key === '2062a3f35e8fdb051e9362a8a8895d80ef719832e9394babcbaab3aac56d4f0e') {
+    pending.push(import('./chunks/chunk-0980a344d761e100f78a8df513a682bdcc702314eb249c64b972cbe64fc2a813.js'));
+  }
+  if (key === '39b4a07b2b07a780f8ac9d2f7cc855e3b78ec60465d9d808690466c1f0bea792') {
+    pending.push(import('./chunks/chunk-9067a52cbc57d972c6155501cef5bd27a816f0c7adf6390a603c7b4e9bbddce3.js'));
+  }
   if (key === '68a5f871903ca703f0fac8dd0072e1bfc082ffa14aa445026be6e1eb6cfe1bd0') {
     pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
   }
-  if (key === '53ff1588255d7e5486eb67452c8d9c43baea0eecd9bd509fd7f0c55b3cccaa0d') {
-    pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
-  }
-  if (key === '4e356c0939a28ab8766b0375ca6cb478b6163eb9ad80745a9e2f2fc80997b6a2') {
-    pending.push(import('./chunks/chunk-82d1654bda3835e43a2a0c9a2e52925f12dc4a2fcd20b5f40603dbbe6eb1ff23.js'));
-  }
-  if (key === 'b4afd0c0906e26b51836d41720e1b8d91a7cacf0fd42e089f1e0fbc2ee27a5bb') {
-    pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
-  }
-  if (key === '2062a3f35e8fdb051e9362a8a8895d80ef719832e9394babcbaab3aac56d4f0e') {
-    pending.push(import('./chunks/chunk-0980a344d761e100f78a8df513a682bdcc702314eb249c64b972cbe64fc2a813.js'));
+  if (key === 'ac7af13a0805d3ce8a287e9d860521c82aaf55d2c448ce3f62a85d44216a8189') {
+    pending.push(import('./chunks/chunk-7eb0e92a81bb7e9cb5e0c25a28ae3459e5223c6322ff3569292a66f45a9990ae.js'));
   }
   return Promise.all(pending);
 }
diff --git a/kontor-spring/src/main/frontend/generated/flow/generated-flow-webcomponent-imports.js b/kontor-spring/src/main/frontend/generated/flow/generated-flow-webcomponent-imports.js
index c6d2b9d..795cc8c 100644
--- a/kontor-spring/src/main/frontend/generated/flow/generated-flow-webcomponent-imports.js
+++ b/kontor-spring/src/main/frontend/generated/flow/generated-flow-webcomponent-imports.js
@@ -7,29 +7,29 @@ import 'Frontend/generated/jar-resources/ReactRouterOutletElement.tsx';
 
 const loadOnDemand = (key) => {
   const pending = [];
-  if (key === '81bbe2e11b6af26d0d292e2e18bde37546d5b9ec24f4f4f78df2bc9f9c21f431') {
-    pending.push(import('./chunks/chunk-ba68801837253f4860e3f4374e9ae9e48ccba4ca6110cac47de37e40d7b6199e.js'));
+  if (key === 'c5f987a4896c791d13aeb6a03a4783ff03df304750a7db930a18d399dba31509') {
+    pending.push(import('./chunks/chunk-7eb0e92a81bb7e9cb5e0c25a28ae3459e5223c6322ff3569292a66f45a9990ae.js'));
   }
-  if (key === '8904207b9d538b9eedfaaefd8e82d3415de8513bda9d6bb76f4012f0f336d200') {
-    pending.push(import('./chunks/chunk-34d02800587f0d3950a0cf1f566793c706accc702ca93d2f51ab25f74d29bd84.js'));
-  }
-  if (key === '96ecac798fbbe91ef146ac4a25f5c31827427ca0f106ba66e63fc1fd6c27b83d') {
-    pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
-  }
-  if (key === 'c0816c2bfaa97d6f3e7eea83c5478186457bdc79cfe3f284c42e192d68607157') {
+  if (key === '83045a9760ea76fd534ed71ed553dc7cf2595a5d697e3c7bc55470d219770d05') {
     pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
   }
   if (key === '58cc18f5518623050c6a99d327dd540140b9b0dca851a76a70e688291f661e11') {
     pending.push(import('./chunks/chunk-94486ac490d7aebdfb2696122da529dc74cba54f50b75f3f737368bd86850d36.js'));
   }
-  if (key === '83045a9760ea76fd534ed71ed553dc7cf2595a5d697e3c7bc55470d219770d05') {
+  if (key === 'b4afd0c0906e26b51836d41720e1b8d91a7cacf0fd42e089f1e0fbc2ee27a5bb') {
     pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
   }
-  if (key === 'e9df10b3be58513bb6452e4dbdce31e0b1dc33868fbba54ee72e82089cf39adf') {
-    pending.push(import('./chunks/chunk-34d02800587f0d3950a0cf1f566793c706accc702ca93d2f51ab25f74d29bd84.js'));
+  if (key === '96ecac798fbbe91ef146ac4a25f5c31827427ca0f106ba66e63fc1fd6c27b83d') {
+    pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
   }
-  if (key === '39b4a07b2b07a780f8ac9d2f7cc855e3b78ec60465d9d808690466c1f0bea792') {
-    pending.push(import('./chunks/chunk-9067a52cbc57d972c6155501cef5bd27a816f0c7adf6390a603c7b4e9bbddce3.js'));
+  if (key === '2140ca6af7e9a5ff94d8a66b6e5a23e6d184ef7901ca73d33b3c30f74f94708a') {
+    pending.push(import('./chunks/chunk-eab035454a058f437d12e5ccf64ef647181029b965d466c829f5a569b2865dd3.js'));
+  }
+  if (key === '81bbe2e11b6af26d0d292e2e18bde37546d5b9ec24f4f4f78df2bc9f9c21f431') {
+    pending.push(import('./chunks/chunk-ba68801837253f4860e3f4374e9ae9e48ccba4ca6110cac47de37e40d7b6199e.js'));
+  }
+  if (key === 'c0816c2bfaa97d6f3e7eea83c5478186457bdc79cfe3f284c42e192d68607157') {
+    pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
   }
   if (key === '803ed44611ffeb1bcb1f604f267f09af48ef8a5bc8d765e481b67ed59f9b880a') {
     pending.push(import('./chunks/chunk-5f54f3be0c0d908c0477e60450f72fbb60bfa31e84e7d18b39841a003d995f86.js'));
@@ -37,83 +37,83 @@ const loadOnDemand = (key) => {
   if (key === '9f40817b690e11a5b23a3159bb774f15430c23768f26dc0d15efccc3d65223ac') {
     pending.push(import('./chunks/chunk-c2a7e008275ccefd2b71f714af29d0186f49edb012ac8081cb81d0a896594da6.js'));
   }
-  if (key === '391ac9fb4bd95bc899c5911c48a6f3b549b118923653444f5ab50acddfb6f291') {
-    pending.push(import('./chunks/chunk-7eb0e92a81bb7e9cb5e0c25a28ae3459e5223c6322ff3569292a66f45a9990ae.js'));
-  }
-  if (key === '1ac8bd8d734d2603947b1db0616ea4dae4ce691a5264f5c9aeafcaa897e0a872') {
-    pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
-  }
-  if (key === 'e5db1fd1f39047ab2857e9ef118681c3f831f39efbbb2a6f000e9475b77444e5') {
-    pending.push(import('./chunks/chunk-94486ac490d7aebdfb2696122da529dc74cba54f50b75f3f737368bd86850d36.js'));
-  }
-  if (key === '92a567041312ea4c7faa4dd5bcc74f73cd3b16dd721624d0bc68d1704138abe5') {
-    pending.push(import('./chunks/chunk-4f16ee624545500a5dde991be4f07a661d86951bbc2c07a010daabbd423b1909.js'));
-  }
-  if (key === 'bfac19b5aab9cd5a47ff4a66f2a839ebbb4889867824be809c5dc3a3d47f94b8') {
+  if (key === '89c2914ed5d19860240c0c1d3dba174616dc452c4ba8ae039f016cf9592e9432') {
     pending.push(import('./chunks/chunk-7eb0e92a81bb7e9cb5e0c25a28ae3459e5223c6322ff3569292a66f45a9990ae.js'));
   }
   if (key === 'a886fd99e05dd2c5ce3e4b643dc8d6d29189dee784fa78678d8ab4fcb89216c0') {
     pending.push(import('./chunks/chunk-4643e5b30878e982c301927c78b86af508e91d91560341ef83fa0e6bf79dedee.js'));
   }
-  if (key === 'becc589ccd4f7ac5e6f13c45eecc05f61d67ce57f585f1655800354ff4b55f3c') {
-    pending.push(import('./chunks/chunk-c2a7e008275ccefd2b71f714af29d0186f49edb012ac8081cb81d0a896594da6.js'));
+  if (key === 'a4eeeab53770801e478b15e6b179e5689afd43fc753f347e0c51ce934bd28a6c') {
+    pending.push(import('./chunks/chunk-0980a344d761e100f78a8df513a682bdcc702314eb249c64b972cbe64fc2a813.js'));
+  }
+  if (key === '391ac9fb4bd95bc899c5911c48a6f3b549b118923653444f5ab50acddfb6f291') {
+    pending.push(import('./chunks/chunk-7eb0e92a81bb7e9cb5e0c25a28ae3459e5223c6322ff3569292a66f45a9990ae.js'));
   }
   if (key === '0ca48a0e12f1dbf4945f761a93a7df202b2908327a63c52f2f060559c2bcc7f0') {
     pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
   }
-  if (key === '2140ca6af7e9a5ff94d8a66b6e5a23e6d184ef7901ca73d33b3c30f74f94708a') {
-    pending.push(import('./chunks/chunk-eab035454a058f437d12e5ccf64ef647181029b965d466c829f5a569b2865dd3.js'));
+  if (key === '92a567041312ea4c7faa4dd5bcc74f73cd3b16dd721624d0bc68d1704138abe5') {
+    pending.push(import('./chunks/chunk-4f16ee624545500a5dde991be4f07a661d86951bbc2c07a010daabbd423b1909.js'));
   }
-  if (key === '89c2914ed5d19860240c0c1d3dba174616dc452c4ba8ae039f016cf9592e9432') {
+  if (key === 'e9df10b3be58513bb6452e4dbdce31e0b1dc33868fbba54ee72e82089cf39adf') {
+    pending.push(import('./chunks/chunk-34d02800587f0d3950a0cf1f566793c706accc702ca93d2f51ab25f74d29bd84.js'));
+  }
+  if (key === 'becc589ccd4f7ac5e6f13c45eecc05f61d67ce57f585f1655800354ff4b55f3c') {
+    pending.push(import('./chunks/chunk-c2a7e008275ccefd2b71f714af29d0186f49edb012ac8081cb81d0a896594da6.js'));
+  }
+  if (key === 'bfac19b5aab9cd5a47ff4a66f2a839ebbb4889867824be809c5dc3a3d47f94b8') {
     pending.push(import('./chunks/chunk-7eb0e92a81bb7e9cb5e0c25a28ae3459e5223c6322ff3569292a66f45a9990ae.js'));
   }
-  if (key === 'ffd87f879398d3b6942e852eda9b64e28a124c8a61938c867efb360a5cf1d32e') {
-    pending.push(import('./chunks/chunk-7eb0e92a81bb7e9cb5e0c25a28ae3459e5223c6322ff3569292a66f45a9990ae.js'));
-  }
-  if (key === 'c5f987a4896c791d13aeb6a03a4783ff03df304750a7db930a18d399dba31509') {
-    pending.push(import('./chunks/chunk-7eb0e92a81bb7e9cb5e0c25a28ae3459e5223c6322ff3569292a66f45a9990ae.js'));
-  }
-  if (key === '3665d7598c9ed4112997a0493fb890edf38d23d3bd9fcb0eb09bf3e045f5228b') {
-    pending.push(import('./chunks/chunk-7eb0e92a81bb7e9cb5e0c25a28ae3459e5223c6322ff3569292a66f45a9990ae.js'));
-  }
-  if (key === '4e76ad4411fbf58731cdad95d28e6fe0057fb4a97ffd54f193e52b111462552d') {
-    pending.push(import('./chunks/chunk-ba68801837253f4860e3f4374e9ae9e48ccba4ca6110cac47de37e40d7b6199e.js'));
+  if (key === '1ac8bd8d734d2603947b1db0616ea4dae4ce691a5264f5c9aeafcaa897e0a872') {
+    pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
   }
   if (key === '3e87cbb0d40d50da9c3b69d0dada85fe9b7f2f4bae2b79c8f0408a798b120549') {
     pending.push(import('./chunks/chunk-5e457c2d02d56b468106fc6b3ad37f1215d95af443e88a25314d583049fa7ada.js'));
   }
-  if (key === 'ac7af13a0805d3ce8a287e9d860521c82aaf55d2c448ce3f62a85d44216a8189') {
-    pending.push(import('./chunks/chunk-7eb0e92a81bb7e9cb5e0c25a28ae3459e5223c6322ff3569292a66f45a9990ae.js'));
+  if (key === 'e5db1fd1f39047ab2857e9ef118681c3f831f39efbbb2a6f000e9475b77444e5') {
+    pending.push(import('./chunks/chunk-94486ac490d7aebdfb2696122da529dc74cba54f50b75f3f737368bd86850d36.js'));
   }
-  if (key === 'a4eeeab53770801e478b15e6b179e5689afd43fc753f347e0c51ce934bd28a6c') {
-    pending.push(import('./chunks/chunk-0980a344d761e100f78a8df513a682bdcc702314eb249c64b972cbe64fc2a813.js'));
+  if (key === '8904207b9d538b9eedfaaefd8e82d3415de8513bda9d6bb76f4012f0f336d200') {
+    pending.push(import('./chunks/chunk-34d02800587f0d3950a0cf1f566793c706accc702ca93d2f51ab25f74d29bd84.js'));
+  }
+  if (key === '4e76ad4411fbf58731cdad95d28e6fe0057fb4a97ffd54f193e52b111462552d') {
+    pending.push(import('./chunks/chunk-ba68801837253f4860e3f4374e9ae9e48ccba4ca6110cac47de37e40d7b6199e.js'));
+  }
+  if (key === '53ff1588255d7e5486eb67452c8d9c43baea0eecd9bd509fd7f0c55b3cccaa0d') {
+    pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
+  }
+  if (key === '3665d7598c9ed4112997a0493fb890edf38d23d3bd9fcb0eb09bf3e045f5228b') {
+    pending.push(import('./chunks/chunk-7eb0e92a81bb7e9cb5e0c25a28ae3459e5223c6322ff3569292a66f45a9990ae.js'));
   }
   if (key === 'dca37e6961f625182e78a722a61c0eb9b8a2357b5e787fe616fe5993c2db5133') {
     pending.push(import('./chunks/chunk-dbbf8c73fe9c2c76fb9306f96bfa7ff293eff804705670e651ac024bea9551bd.js'));
   }
+  if (key === 'ffd87f879398d3b6942e852eda9b64e28a124c8a61938c867efb360a5cf1d32e') {
+    pending.push(import('./chunks/chunk-7eb0e92a81bb7e9cb5e0c25a28ae3459e5223c6322ff3569292a66f45a9990ae.js'));
+  }
   if (key === '5d710852587ce9ebabfac9ed950f6b11bc3a87d96860d4efdfb61dab7ae54091') {
     pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
   }
   if (key === '2b0ca0e51ded6027d3f9e464513210d5503ab2a9bc532de5cfc81d78a58f422f') {
     pending.push(import('./chunks/chunk-c2a7e008275ccefd2b71f714af29d0186f49edb012ac8081cb81d0a896594da6.js'));
   }
+  if (key === '4e356c0939a28ab8766b0375ca6cb478b6163eb9ad80745a9e2f2fc80997b6a2') {
+    pending.push(import('./chunks/chunk-82d1654bda3835e43a2a0c9a2e52925f12dc4a2fcd20b5f40603dbbe6eb1ff23.js'));
+  }
   if (key === '28b5e9145505152a4dbd9600977b8177d3a161906581ca5a1a923affc812a761') {
     pending.push(import('./chunks/chunk-5e457c2d02d56b468106fc6b3ad37f1215d95af443e88a25314d583049fa7ada.js'));
   }
+  if (key === '2062a3f35e8fdb051e9362a8a8895d80ef719832e9394babcbaab3aac56d4f0e') {
+    pending.push(import('./chunks/chunk-0980a344d761e100f78a8df513a682bdcc702314eb249c64b972cbe64fc2a813.js'));
+  }
+  if (key === '39b4a07b2b07a780f8ac9d2f7cc855e3b78ec60465d9d808690466c1f0bea792') {
+    pending.push(import('./chunks/chunk-9067a52cbc57d972c6155501cef5bd27a816f0c7adf6390a603c7b4e9bbddce3.js'));
+  }
   if (key === '68a5f871903ca703f0fac8dd0072e1bfc082ffa14aa445026be6e1eb6cfe1bd0') {
     pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
   }
-  if (key === '53ff1588255d7e5486eb67452c8d9c43baea0eecd9bd509fd7f0c55b3cccaa0d') {
-    pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
-  }
-  if (key === '4e356c0939a28ab8766b0375ca6cb478b6163eb9ad80745a9e2f2fc80997b6a2') {
-    pending.push(import('./chunks/chunk-82d1654bda3835e43a2a0c9a2e52925f12dc4a2fcd20b5f40603dbbe6eb1ff23.js'));
-  }
-  if (key === 'b4afd0c0906e26b51836d41720e1b8d91a7cacf0fd42e089f1e0fbc2ee27a5bb') {
-    pending.push(import('./chunks/chunk-79565f1f0670029d94da9f00948c9fc73575b3c6dc12ea07cca72303e68fbd57.js'));
-  }
-  if (key === '2062a3f35e8fdb051e9362a8a8895d80ef719832e9394babcbaab3aac56d4f0e') {
-    pending.push(import('./chunks/chunk-0980a344d761e100f78a8df513a682bdcc702314eb249c64b972cbe64fc2a813.js'));
+  if (key === 'ac7af13a0805d3ce8a287e9d860521c82aaf55d2c448ce3f62a85d44216a8189') {
+    pending.push(import('./chunks/chunk-7eb0e92a81bb7e9cb5e0c25a28ae3459e5223c6322ff3569292a66f45a9990ae.js'));
   }
   return Promise.all(pending);
 }
diff --git a/script/cibuild b/script/cibuild
index da8bdba..137a029 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -14,11 +14,11 @@ cd kontor-spring
 ./gradlew bootJar
 cd ..
 buildah build -f Containerfile.local -t kontor-spring:$kontorVersion kontor-spring
-echo "  => Baue Python Library kontor-model:$kontorVersion"
-cd kontor-model
-uv sync
-uv publish --index nexus
-cd ..
+#echo "  => Baue Python Library kontor-model:$kontorVersion"
+#cd kontor-model
+#uv sync
+#uv publish --index nexus
+#cd ..
 echo "  => Baue Image localhost/kontor-api:$kontorVersion"
 buildah build -t kontor-api:$kontorVersion kontor-api
 echo "  => Baue Image localhost/kontor-quarkus:$kontorVersion"
diff --git a/script/create_container_activemq b/script/create_container_activemq
new file mode 100755
index 0000000..f5fd5e3
--- /dev/null
+++ b/script/create_container_activemq
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# script/setup: Set up container for the first time after cloning
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+source version
+
+script/bootstrap
+
+echo "==> Setting up container activemq"
+if podman container exists activemq; then
+    if podman ps -q --filter "name=activemq"; then
+        echo "  => adminer is running"
+    fi
+else
+    podman run -d --replace --pod kontor --name activemq \
+        -v activemq-data:/var/lib/artemis-instance \
+        docker.io/apache/activemq-artemis:latest-alpine
+fi
+
diff --git a/script/create_container_kontor-angular b/script/create_container_kontor-angular
new file mode 100755
index 0000000..5e8fba1
--- /dev/null
+++ b/script/create_container_kontor-angular
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# script/setup: Set up container for the first time after cloning
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+source version
+
+script/bootstrap
+
+echo "==> Setting up container kontor-angular"
+if podman image exists localhost/kontor-angular:$kontorVersion; then
+    echo "  => Image localhost/kontor-angular:$kontorVersion available"
+fi
+if podman container exists kontor-angular; then
+    if podman ps -q --filter "name=kontor-angular"; then
+        echo "  => kontor-angular is running"
+    fi
+else
+    podman run -d \
+        --replace \
+        --pod kontor \
+        --name kontor-angular \
+        --label "io.containers.autoupdate=local" \
+        --label "PODMAN_SYSTEMD_UNIT=container-kontor-angular.service" \
+        localhost/kontor-angular:$kontorVersion
+fi
+
diff --git a/script/create_container_kontor-api b/script/create_container_kontor-api
new file mode 100755
index 0000000..6f52219
--- /dev/null
+++ b/script/create_container_kontor-api
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# script/setup: Set up container for the first time after cloning
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+source version
+
+script/bootstrap
+
+echo "==> Setting up container kontor-api"
+if podman image exists localhost/kontor-api:$kontorVersion; then
+    echo "  => Image localhost/kontor-api:$kontorVersion available"
+fi
+if podman container exists kontor-api; then
+    if podman ps -q --filter "name=kontor-api"; then
+        echo "  => kontor-api is running"
+    fi
+else
+    podman run -d \
+        --replace \
+        --pod kontor \
+        --name kontor-api \
+        --label "io.containers.autoupdate=local" \
+        --label "PODMAN_SYSTEMD_UNIT=container-kontor-api.service" \
+        --health-cmd='curl -f http://kontor-api:8200/health || exit 1' \
+        --health-interval=1s \
+        --health-timeout=5s \
+        --health-retries=10 \
+        localhost/kontor-api:$kontorVersion
+fi
+
diff --git a/script/create_container_kontor-echo b/script/create_container_kontor-echo
new file mode 100755
index 0000000..bea9751
--- /dev/null
+++ b/script/create_container_kontor-echo
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# script/setup: Set up container for the first time after cloning
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+source version
+
+script/bootstrap
+
+echo "==> Setting up container kontor-echo"
+if podman image exists localhost/kontor-echo:$kontorVersion; then
+    echo "  => Image localhost/kontor-echo:$kontorVersion available"
+fi
+if podman container exists kontor-echo; then
+    if podman ps -q --filter "name=kontor-echo"; then
+        echo "  => kontor-echo is running"
+    fi
+else
+    podman run -d \
+        --replace \
+        --pod kontor \
+        --name kontor-echo \
+        --label "io.containers.autoupdate=local" \
+        --label "PODMAN_SYSTEMD_UNIT=container-kontor-echo.service" \
+        --health-cmd='curl -f http://kontor-echo:8400/health || exit 1' \
+        --health-interval=1s \
+        --health-timeout=5s \
+        --health-retries=10 \
+        localhost/kontor-echo:$kontorVersion
+fi
+
diff --git a/script/create_container_kontor-fiber b/script/create_container_kontor-fiber
new file mode 100755
index 0000000..97d939c
--- /dev/null
+++ b/script/create_container_kontor-fiber
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# script/setup: Set up container for the first time after cloning
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+source version
+
+script/bootstrap
+
+echo "==> Setting up container kontor-fiber"
+if podman image exists localhost/kontor-fiber:$kontorVersion; then
+    echo "  => Image localhost/kontor-fiber:$kontorVersion available"
+fi
+if podman container exists kontor-fiber; then
+    if podman ps -q --filter "name=kontor-fiber"; then
+        echo "  => kontor-fiber is running"
+    fi
+else
+    podman run -d \
+        --replace \
+        --pod kontor \
+        --name kontor-fiber \
+        --label "io.containers.autoupdate=local" \
+        --label "PODMAN_SYSTEMD_UNIT=container-kontor-fiber.service" \
+        --health-cmd='curl -f http://kontor-echo:8500/health || exit 1' \
+        --health-interval=1s \
+        --health-timeout=5s \
+        --health-retries=10 \
+        localhost/kontor-fiber:$kontorVersion
+fi
+
diff --git a/script/create_container_kontor-javalin b/script/create_container_kontor-javalin
new file mode 100755
index 0000000..a1ce5a0
--- /dev/null
+++ b/script/create_container_kontor-javalin
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# script/setup: Set up container for the first time after cloning
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+source version
+
+script/bootstrap
+
+#script/cibuild
+
+echo "==> Setting up container kontor-javalin"
+if podman image exists localhost/kontor-javalin:$kontorVersion; then
+    echo "  => Image localhost/kontor-javalin:$kontorVersion available"
+fi
+if podman container exists kontor-javalin; then
+    if podman ps -q --filter "name=kontor-javalin"; then
+        echo "  => kontor-javalin is running"
+    fi
+else
+    podman run -d \
+        --replace \
+        --pod kontor \
+        --name kontor-javalin \
+        --label "io.containers.autoupdate=local" \
+        --label "PODMAN_SYSTEMD_UNIT=container-kontor-javalin.service" \
+        --health-cmd='curl -f http://kontor-echo:8600/health || exit 1' \
+        --health-interval=1s \
+        --health-timeout=5s \
+        --health-retries=10 \
+        localhost/kontor-javalin:$kontorVersion
+fi
+
diff --git a/script/create_container_kontor-quarkus b/script/create_container_kontor-quarkus
new file mode 100755
index 0000000..4ec60c1
--- /dev/null
+++ b/script/create_container_kontor-quarkus
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# script/setup: Set up container for the first time after cloning
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+source version
+
+script/bootstrap
+
+echo "==> Setting up container kontor-quarkus"
+if podman image exists localhost/kontor-quarkus:$kontorVersion; then
+    echo "  => Image localhost/kontor-quarkus:$kontorVersion available"
+fi
+if podman container exists kontor-quarkus; then
+    if podman ps -q --filter "name=kontor-quarkus"; then
+        echo "  => kontor-quarkus is running"
+    fi
+else
+    podman run -d \
+        --replace \
+        --pod kontor \
+        --name kontor-quarkus \
+        --label "io.containers.autoupdate=local" \
+        --label "PODMAN_SYSTEMD_UNIT=container-kontor-quarkus.service" \
+        --health-cmd='curl -f http://kontor-quarkus:8300/q/health || exit 1' \
+        --health-interval=1s \
+        --health-timeout=5s \
+        --health-retries=10 \
+        localhost/kontor-quarkus:$kontorVersion
+fi
+
diff --git a/script/create_container_kontor-spring b/script/create_container_kontor-spring
new file mode 100755
index 0000000..f7b236d
--- /dev/null
+++ b/script/create_container_kontor-spring
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# script/setup: Set up container for the first time after cloning
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+source version
+
+script/bootstrap
+
+echo "==> Setting up container kontor-spring"
+if podman image exists localhost/kontor-spring:i$kontorVersion; then
+    echo "  => Image localhost/kontor-spring:$kontorVersion available"
+fi
+if podman container exists kontor-spring; then
+    if podman ps -q --filter "name=kontor-spring"; then
+        echo "  => kontor-spring is running"
+    fi
+else
+    podman run -d \
+        --replace \
+        --pod kontor \
+        --name kontor-spring \
+        --label "io.containers.autoupdate=local" \
+        --label "PODMAN_SYSTEMD_UNIT=container-kontor-spring.service" \
+        localhost/kontor-spring:$kontorVersion
+fi
+
diff --git a/script/create_container_kontor-vue b/script/create_container_kontor-vue
new file mode 100755
index 0000000..cd2b48a
--- /dev/null
+++ b/script/create_container_kontor-vue
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# script/setup: Set up container for the first time after cloning
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+source version
+
+script/bootstrap
+
+echo "==> Setting up container kontor-vue"
+if podman image exists localhost/kontor-vue:$kontorVersion; then
+    echo "  => Image localhost/kontor-vue:$kontorVersion available"
+fi
+if podman container exists kontor-vue; then
+    if podman ps -q --filter "name=kontor-vue"; then
+        echo "  => kontor-vue is running"
+    fi
+else
+    podman run -d \
+        --replace \
+        --pod kontor \
+        --name kontor-vue \
+        --label "io.containers.autoupdate=local" \
+        --label "PODMAN_SYSTEMD_UNIT=container-kontor-vue.service" \
+        localhost/kontor-vue:$kontorVersion
+fi
+
diff --git a/script/create_container_postgres b/script/create_container_postgres
new file mode 100755
index 0000000..85df11b
--- /dev/null
+++ b/script/create_container_postgres
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# script/setup: Set up container for the first time after cloning
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+source version
+
+script/bootstrap
+
+echo "==> Setting up container postgres"
+if podman container exists postgres; then
+    if podman ps -q --filter "name=postgres"; then
+        echo "  => postgres is running"
+    fi
+else
+    if podman secret exists pg_password; then
+        echo "  => secret exists"
+    else
+        echo "kontor" | podman secret create pg_password -
+    fi
+    podman run -d --replace --pod kontor --name postgres \
+        --secret source=pg_password,type=env,target=POSTGRES_PASSWORD \
+        -e POSTGRES_DB=kontor \
+        -e POSTGRES_USER=kontor \
+	-e POSTGRES_HOST_AUTH_METHOD=scram-sha-256 \
+        -v kontor-db:/var/lib/postgresql/data \
+        --health-cmd='pg_isready -U kontor || exit 1' \
+        --health-interval=1s \
+        --health-timeout=5s \
+        --health-retries=10 \
+        docker.io/library/postgres:17
+fi
+
+echo "==> Setting up container adminer"
+if podman container exists adminer; then
+    if podman ps -q --filter "name=adminer"; then
+        echo "  => adminer is running"
+    fi
+else
+    podman run -d --replace --pod kontor --name adminer docker.io/library/adminer
+fi
+
+
+echo "==> Setting up container pgadmin"
+if podman container exists pgadmin; then
+    if podman ps -q --filter "name=pgadmin"; then
+        echo "  => pgadmin is running"
+    fi
+else
+    podman run -d --replace --pod kontor --name pgadmin \
+        -e 'PGADMIN_DEFAULT_EMAIL=thomas.peetz@thpeetz.de' \
+	-e 'PGADMIN_DEFAULT_PASSWORD=kontor' \
+	docker.io/dpage/pgadmin4:latest
+fi
+
diff --git a/script/create_pod_kontor b/script/create_pod_kontor
new file mode 100755
index 0000000..458d74f
--- /dev/null
+++ b/script/create_pod_kontor
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# script/create_pod_kontor: Set up container for the first time after cloning
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+source version
+
+
+echo "==> Setting up pod kontor"
+if podman pod exists kontor; then
+    echo "  => pod kontor exists"
+    if podman pod ps --filter "name=kontor" --filter "status=running"; then
+        echo "    => pod kontor is running"
+    else
+        podman pod start kontor
+    fi
+else
+    podman pod create --name kontor \
+    --infra \
+    -p 5432:5432 \
+    -p 8100:8100 \
+    -p 8200:8200 \
+    -p 8300:8300 \
+    -p 8400:8400 \
+    -p 8500:8500 \
+    -p 8600:8600 \
+    -p 8700:8700 \
+    -p 8800:8800 \
+    -p 8900:8080 \
+    -p 9876:80 \
+    -p 61616:61616 \
+    -p 8161:8161 \
+    -p 5672:5672 \
+    --network bridge
+fi
+
diff --git a/script/create_volumes b/script/create_volumes
new file mode 100755
index 0000000..43d3317
--- /dev/null
+++ b/script/create_volumes
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# script/setup: Set up container for the first time after cloning
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+source version
+
+echo "==> Setting up volume kontor-db"
+if podman volume exists kontor-db; then
+    echo "  => volume kontor-db exists"
+else
+    podman volume create kontor-db
+fi
+
+echo "==> Setting up volume activemq-data"
+if podman volume exists activemq-data; then
+    echo "  => volume kontor-db exists"
+else
+    podman volume create activemq-data
+fi
+
diff --git a/script/setup b/script/setup
index 28abdf9..878e681 100755
--- a/script/setup
+++ b/script/setup
@@ -12,247 +12,27 @@ script/bootstrap
 
 #script/cibuild
 
+script/create_pod_kontor
 
-echo "==> Setting up pod kontor"
-if podman pod exists kontor; then
-    echo "  => pod kontor exists"
-    if podman pod ps --filter "name=kontor" --filter "status=running"; then
-        echo "    => pod kontor is running"
-    else
-        podman pod start kontor
-    fi
-else
-    podman pod create --name kontor \
-    --infra \
-    -p 5432:5432 \
-    -p 8100:8100 \
-    -p 8200:8200 \
-    -p 8300:8300 \
-    -p 8400:8400 \
-    -p 8500:8500 \
-    -p 8600:8600 \
-    -p 8700:8700 \
-    -p 8800:8800 \
-    -p 8900:8080 \
-    -p 61616:61616 \
-    -p 8161:8161 \
-    -p 5672:5672 \
-    --network bridge
-fi
+script/create_volumes
 
-echo "==> Setting up volume kontor-db"
-if podman volume exists kontor-db; then
-    echo "  => volume kontor-db exists"
-else
-    podman volume create kontor-db
-fi
+script/create_container_postgres
 
-echo "==> Setting up volume activemq-data"
-if podman volume exists activemq-data; then
-    echo "  => volume kontor-db exists"
-else
-    podman volume create activemq-data
-fi
+script/create_container_activemq
 
-echo "==> Setting up container postgres"
-if podman container exists postgres; then
-    if podman ps -q --filter "name=postgres"; then
-        echo "  => postgres is running"
-    fi
-else
-    podman run -d --replace --pod kontor --name postgres \
-        -e POSTGRES_PASSWORD=kontor \
-        -e POSTGRES_DB=kontor \
-        -e POSTGRES_USER=kontor \
-        -v kontor-db:/var/lib/postgresql/data \
-        --health-cmd='pg_isready -U kontor || exit 1' \
-        --health-interval=1s \
-        --health-timeout=5s \
-        --health-retries=10 \
-        docker.io/library/postgres:17
-fi
+script/create_container_kontor-spring
 
-echo "==> Setting up container adminer"
-if podman container exists adminer; then
-    if podman ps -q --filter "name=adminer"; then
-        echo "  => adminer is running"
-    fi
-else
-    podman run -d --replace --pod kontor --name adminer docker.io/library/adminer
-fi
+script/create_container_kontor-api
 
-echo "==> Setting up container activemq"
-if podman container exists activemq; then
-    if podman ps -q --filter "name=activemq"; then
-        echo "  => adminer is running"
-    fi
-else
-    podman run -d --replace --pod kontor --name activemq \
-        -v activemq-data:/var/lib/artemis-instance \
-        docker.io/apache/activemq-artemis:latest-alpine
-fi
+script/create_container_kontor-quarkus
 
-echo "==> Setting up container kontor-spring"
-if podman image exists localhost/kontor-spring:i$kontorVersion; then
-    echo "  => Image localhost/kontor-spring:$kontorVersion available"
-fi
-if podman container exists kontor-spring; then
-    if podman ps -q --filter "name=kontor-spring"; then
-        echo "  => kontor-spring is running"
-    fi
-else
-    podman run -d \
-        --replace \
-        --pod kontor \
-        --name kontor-spring \
-        --label "io.containers.autoupdate=local" \
-        --label "PODMAN_SYSTEMD_UNIT=container-kontor-spring.service" \
-        localhost/kontor-spring:$kontorVersion
-fi
+script/create_container_kontor-echo
 
-echo "==> Setting up container kontor-api"
-if podman image exists localhost/kontor-api:$kontorVersion; then
-    echo "  => Image localhost/kontor-api:$kontorVersion available"
-fi
-if podman container exists kontor-api; then
-    if podman ps -q --filter "name=kontor-api"; then
-        echo "  => kontor-api is running"
-    fi
-else
-    podman run -d \
-        --replace \
-        --pod kontor \
-        --name kontor-api \
-        --label "io.containers.autoupdate=local" \
-        --label "PODMAN_SYSTEMD_UNIT=container-kontor-api.service" \
-        --health-cmd='curl -f http://kontor-api:8200/health || exit 1' \
-        --health-interval=1s \
-        --health-timeout=5s \
-        --health-retries=10 \
-        localhost/kontor-api:$kontorVersion
-fi
+script/create_container_kontor-fiber
 
-echo "==> Setting up container kontor-quarkus"
-if podman image exists localhost/kontor-quarkus:$kontorVersion; then
-    echo "  => Image localhost/kontor-quarkus:$kontorVersion available"
-fi
-if podman container exists kontor-quarkus; then
-    if podman ps -q --filter "name=kontor-quarkus"; then
-        echo "  => kontor-quarkus is running"
-    fi
-else
-    podman run -d \
-        --replace \
-        --pod kontor \
-        --name kontor-quarkus \
-        --label "io.containers.autoupdate=local" \
-        --label "PODMAN_SYSTEMD_UNIT=container-kontor-quarkus.service" \
-        --health-cmd='curl -f http://kontor-quarkus:8300/q/health || exit 1' \
-        --health-interval=1s \
-        --health-timeout=5s \
-        --health-retries=10 \
-        localhost/kontor-quarkus:$kontorVersion
-fi
+script/create_container_kontor-javalin
 
-echo "==> Setting up container kontor-echo"
-if podman image exists localhost/kontor-echo:$kontorVersion; then
-    echo "  => Image localhost/kontor-echo:$kontorVersion available"
-fi
-if podman container exists kontor-echo; then
-    if podman ps -q --filter "name=kontor-echo"; then
-        echo "  => kontor-echo is running"
-    fi
-else
-    podman run -d \
-        --replace \
-        --pod kontor \
-        --name kontor-echo \
-        --label "io.containers.autoupdate=local" \
-        --label "PODMAN_SYSTEMD_UNIT=container-kontor-echo.service" \
-        --health-cmd='curl -f http://kontor-echo:8400/health || exit 1' \
-        --health-interval=1s \
-        --health-timeout=5s \
-        --health-retries=10 \
-        localhost/kontor-echo:$kontorVersion
-fi
+script/create_container_kontor-vue
 
-echo "==> Setting up container kontor-fiber"
-if podman image exists localhost/kontor-fiber:$kontorVersion; then
-    echo "  => Image localhost/kontor-fiber:$kontorVersion available"
-fi
-if podman container exists kontor-fiber; then
-    if podman ps -q --filter "name=kontor-fiber"; then
-        echo "  => kontor-fiber is running"
-    fi
-else
-    podman run -d \
-        --replace \
-        --pod kontor \
-        --name kontor-fiber \
-        --label "io.containers.autoupdate=local" \
-        --label "PODMAN_SYSTEMD_UNIT=container-kontor-fiber.service" \
-        --health-cmd='curl -f http://kontor-echo:8500/health || exit 1' \
-        --health-interval=1s \
-        --health-timeout=5s \
-        --health-retries=10 \
-        localhost/kontor-fiber:$kontorVersion
-fi
-
-echo "==> Setting up container kontor-javalin"
-if podman image exists localhost/kontor-javalin:$kontorVersion; then
-    echo "  => Image localhost/kontor-javalin:$kontorVersion available"
-fi
-if podman container exists kontor-javalin; then
-    if podman ps -q --filter "name=kontor-javalin"; then
-        echo "  => kontor-javalin is running"
-    fi
-else
-    podman run -d \
-        --replace \
-        --pod kontor \
-        --name kontor-javalin \
-        --label "io.containers.autoupdate=local" \
-        --label "PODMAN_SYSTEMD_UNIT=container-kontor-javalin.service" \
-        --health-cmd='curl -f http://kontor-echo:8600/health || exit 1' \
-        --health-interval=1s \
-        --health-timeout=5s \
-        --health-retries=10 \
-        localhost/kontor-javalin:$kontorVersion
-fi
-
-echo "==> Setting up container kontor-vue"
-if podman image exists localhost/kontor-vue:$kontorVersion; then
-    echo "  => Image localhost/kontor-vue:$kontorVersion available"
-fi
-if podman container exists kontor-vue; then
-    if podman ps -q --filter "name=kontor-vue"; then
-        echo "  => kontor-vue is running"
-    fi
-else
-    podman run -d \
-        --replace \
-        --pod kontor \
-        --name kontor-vue \
-        --label "io.containers.autoupdate=local" \
-        --label "PODMAN_SYSTEMD_UNIT=container-kontor-vue.service" \
-        localhost/kontor-vue:$kontorVersion
-fi
-
-echo "==> Setting up container kontor-angular"
-if podman image exists localhost/kontor-angular:$kontorVersion; then
-    echo "  => Image localhost/kontor-angular:$kontorVersion available"
-fi
-if podman container exists kontor-angular; then
-    if podman ps -q --filter "name=kontor-angular"; then
-        echo "  => kontor-angular is running"
-    fi
-else
-    podman run -d \
-        --replace \
-        --pod kontor \
-        --name kontor-angular \
-        --label "io.containers.autoupdate=local" \
-        --label "PODMAN_SYSTEMD_UNIT=container-kontor-angular.service" \
-        localhost/kontor-angular:$kontorVersion
-fi
+script/create_container_kontor-angular
 
diff --git a/script/update b/script/update
index 819f3d9..3203f0c 100755
--- a/script/update
+++ b/script/update
@@ -11,6 +11,8 @@ source version
 echo "==> Stopping and removing pod kontor"
 if podman pod exists kontor; then
     podman pod stop kontor
+    pause 3
+    podman pod rm kontor
 fi
 
 #script/cibuild