diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Os.xml b/.teamcity/Ribasim/buildTypes/Ribasim_Linux.xml
similarity index 90%
rename from .teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Os.xml
rename to .teamcity/Ribasim/buildTypes/Ribasim_Linux.xml
index 5fb92150b..901a95ae3 100644
--- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Os.xml
+++ b/.teamcity/Ribasim/buildTypes/Ribasim_Linux.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="1a62a1c8-edfc-4fcf-bd8d-0839b10664a3" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
-  <name>Os</name>
+  <name>Linux</name>
   <description>Template for agent that uses Linux OS</description>
   <settings>
     <options>
+      <option name="cleanBuild" value="true" />
       <option name="publishArtifactCondition" value="SUCCESSFUL" />
     </options>
     <parameters />
diff --git a/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_BuildPythonWheels.xml b/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_BuildPythonWheels.xml
deleted file mode 100644
index e81d4a0a2..000000000
--- a/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_BuildPythonWheels.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="46bfa84f-a295-4ed8-a685-45157da0b9a1" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
-  <name>Build Python Wheels</name>
-  <description />
-  <settings>
-    <options>
-      <option name="artifactRules" value="ribasim-*.whl" />
-      <option name="publishArtifactCondition" value="SUCCESSFUL" />
-    </options>
-    <parameters>
-      <param name="conda_env_path" value="%system.teamcity.build.checkoutDir%/pyEnv" />
-      <param name="conda_mm_path" value="%system.teamcity.build.checkoutDir%/mmEnv" />
-    </parameters>
-    <build-runners>
-      <runner id="RUNNER_2223" name="Build wheel" type="simpleRunner">
-        <parameters>
-          <param name="script.content"><![CDATA[#!/usr/bin/env bash
-set -euxo pipefail
-. /usr/share/Modules/init/bash
-ls /opt/apps/modules/anaconda3
-module load anaconda3/miniconda
-rm --force ribasim-*.whl
-pip wheel python/ribasim --no-deps]]></param>
-          <param name="teamcity.step.mode" value="default" />
-          <param name="use.custom.script" value="true" />
-        </parameters>
-      </runner>
-    </build-runners>
-    <vcs-settings>
-      <vcs-entry-ref root-id="Ribasim_Ribasim" />
-    </vcs-settings>
-    <requirements>
-      <does-not-equal id="RQ_296" name="env.OS" value="Windows_NT" />
-    </requirements>
-    <build-triggers>
-      <build-trigger id="TRIGGER_557" type="vcsTrigger">
-        <parameters>
-          <param name="branchFilter"><![CDATA[+:<default>
-+:v*]]></param>
-          <param name="enableQueueOptimization" value="true" />
-          <param name="quietPeriodMode" value="DO_NOT_USE" />
-        </parameters>
-      </build-trigger>
-    </build-triggers>
-    <cleanup />
-  </settings>
-</build-type>
-
diff --git a/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_MakeGitHubRelease.xml b/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_MakeGitHubRelease.xml
index 68ecd2777..b76e884ea 100644
--- a/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_MakeGitHubRelease.xml
+++ b/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_MakeGitHubRelease.xml
@@ -2,7 +2,7 @@
 <build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="5fa3a42d-6a7b-4820-95c1-c550d6648ae7" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
   <name>Make GitHub Release</name>
   <description />
-  <settings>
+  <settings ref="Ribasim_Linux">
     <parameters>
       <param name="env.GITHUB_TOKEN" value="%github_deltares-service-account_access_token%" />
     </parameters>
@@ -23,9 +23,7 @@ pixi run github-release]]></param>
     <vcs-settings>
       <vcs-entry-ref root-id="Ribasim_Ribasim" />
     </vcs-settings>
-    <requirements>
-      <equals id="RQ_294" name="teamcity.agent.jvm.os.name" value="Linux" />
-    </requirements>
+    <requirements />
     <build-triggers>
       <build-trigger id="TRIGGER_637" type="vcsTrigger">
         <parameters>
diff --git a/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_MakeQgisPlugin.xml b/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_MakeQgisPlugin.xml
index a436879c0..d770446c1 100644
--- a/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_MakeQgisPlugin.xml
+++ b/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_MakeQgisPlugin.xml
@@ -2,10 +2,13 @@
 <build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="7a4efefb-e910-456d-bab2-fb807d5ad0f9" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
   <name>Make QGIS plugin</name>
   <description />
-  <settings>
+  <settings ref="Ribasim_Linux">
     <options>
       <option name="artifactRules" value="ribasim_qgis.zip" />
     </options>
+    <disabled-settings>
+      <setting-ref ref="RQ_338" />
+    </disabled-settings>
     <parameters />
     <build-runners>
       <runner id="RUNNER_2193" name="" type="simpleRunner">
diff --git a/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_PushSuccessfulNightlyBuildToS3.xml b/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_PushSuccessfulNightlyBuildToS3.xml
deleted file mode 100644
index 9fe85659d..000000000
--- a/.teamcity/Ribasim/buildTypes/Ribasim_Ribasim_PushSuccessfulNightlyBuildToS3.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="3fe450f2-ad26-44f6-81e0-683a3c8920dd" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
-  <name>Push successful nightly build to S3</name>
-  <description />
-  <settings>
-    <parameters />
-    <build-runners>
-      <runner id="RUNNER_537" name="Push to nightly S3" type="simpleRunner">
-        <parameters>
-          <param name="script.content"><![CDATA[#!/usr/bin/env bash
-set -euxo pipefail
-. /usr/share/Modules/init/bash
-module load aws
-aws s3 cp ribasim_cli_windows.zip s3://ribasim/teamcity/Ribasim_Ribasim/BuildRibasimCliWindows/latest/ribasim_cli_windows.zip
-aws s3 cp ribasim_cli_linux.zip s3://ribasim/teamcity/Ribasim_Ribasim/BuildRibasimCliWindows/latest/ribasim_cli_linux.zip
-aws s3 cp ribasim_qgis.zip s3://ribasim/teamcity/Ribasim_Ribasim/BuildRibasimCliWindows/latest/ribasim_qgis.zip
-aws s3 cp ribasim*.whl s3://ribasim/teamcity/Ribasim_Ribasim/BuildRibasimCliWindows/latest/]]></param>
-          <param name="teamcity.step.mode" value="default" />
-          <param name="use.custom.script" value="true" />
-        </parameters>
-      </runner>
-    </build-runners>
-    <vcs-settings />
-    <requirements>
-      <equals id="RQ_294" name="teamcity.agent.jvm.os.name" value="Linux" />
-    </requirements>
-    <build-triggers>
-      <build-trigger id="TRIGGER_492" type="buildDependencyTrigger">
-        <parameters>
-          <param name="afterSuccessfulBuildOnly" value="true" />
-          <param name="branchFilter" value="+:&lt;default&gt;" />
-          <param name="dependsOn" value="Ribasim_Windows_BuildRibasimCli" />
-        </parameters>
-      </build-trigger>
-    </build-triggers>
-    <build-extensions>
-      <extension id="PROVIDE_AWS_CREDS" type="PROVIDE_AWS_CREDS">
-        <parameters>
-          <param name="awsConnectionId" value="AmazonWebServicesAws" />
-          <param name="awsSessionDuration" value="60" />
-        </parameters>
-      </extension>
-    </build-extensions>
-    <artifact-dependencies>
-      <dependency id="ARTIFACT_DEPENDENCY_606" sourceBuildTypeId="Ribasim_Ribasim_BuildPythonWheels" cleanDestination="false">
-        <revisionRule name="lastSuccessful" revision="latest.lastSuccessful" />
-        <artifact sourcePath="ribasim*.whl" />
-      </dependency>
-      <dependency id="ARTIFACT_DEPENDENCY_603" sourceBuildTypeId="Ribasim_Ribasim_MakeQgisPlugin" cleanDestination="false">
-        <revisionRule name="lastSuccessful" revision="latest.lastSuccessful" />
-        <artifact sourcePath="ribasim_qgis.zip" />
-      </dependency>
-      <dependency id="ARTIFACT_DEPENDENCY_1176" sourceBuildTypeId="Ribasim_Linux_BuildRibasimCli" cleanDestination="false">
-        <revisionRule name="lastSuccessful" revision="latest.lastSuccessful" />
-        <artifact sourcePath="ribasim_cli_linux.zip" />
-      </dependency>
-      <dependency id="ARTIFACT_DEPENDENCY_157" sourceBuildTypeId="Ribasim_Windows_BuildRibasimCli" cleanDestination="true">
-        <revisionRule name="lastSuccessful" revision="latest.lastSuccessful" />
-        <artifact sourcePath="ribasim_cli_windows.zip" />
-      </dependency>
-    </artifact-dependencies>
-    <cleanup />
-  </settings>
-</build-type>
-
diff --git a/.teamcity/Ribasim/buildTypes/Ribasim_Windows.xml b/.teamcity/Ribasim/buildTypes/Ribasim_Windows.xml
new file mode 100644
index 000000000..978df74f5
--- /dev/null
+++ b/.teamcity/Ribasim/buildTypes/Ribasim_Windows.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<template xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="68fc2e9b-b9f2-42f6-b505-5b68e0df151a" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
+  <name>Windows</name>
+  <description>Template for agent that uses Windows OS</description>
+  <settings>
+    <options>
+      <option name="cleanBuild" value="true" />
+    </options>
+    <parameters />
+    <build-runners />
+    <vcs-settings />
+    <requirements>
+      <contains id="RQ_422" name="teamcity.agent.jvm.os.name" value="Windows" />
+    </requirements>
+    <build-triggers />
+    <cleanup />
+  </settings>
+</template>
+
diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml
deleted file mode 100644
index 935189868..000000000
--- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_Build.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<template xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="ba056ffa-f17b-4684-add1-3fcaee0c2a81" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
-  <name>Build</name>
-  <settings>
-    <options>
-      <option name="artifactRules" value="ribasim\build\libribasim =&gt; libribasim.zip" />
-      <option name="cleanBuild" value="true" />
-      <option name="executionTimeoutMin" value="120" />
-      <option name="publishArtifactCondition" value="SUCCESSFUL" />
-    </options>
-    <disabled-settings>
-      <setting-ref ref="RUNNER_2415" />
-      <setting-ref ref="RUNNER_2416" />
-    </disabled-settings>
-    <parameters />
-    <build-runners>
-      <runner id="RUNNER_2415" name="Set up pixi" type="simpleRunner">
-        <parameters>
-          <param name="script.content"><![CDATA[#!/bin/bash
-# black magic
-source /usr/share/Modules/init/bash
-
-module load pixi
-pixi --version
-pixi run --environment=dev install-ci]]></param>
-          <param name="teamcity.build.workingDir" value="ribasim" />
-          <param name="teamcity.step.mode" value="default" />
-          <param name="use.custom.script" value="true" />
-        </parameters>
-      </runner>
-      <runner id="RUNNER_2416" name="Build binary" type="simpleRunner">
-        <parameters>
-          <param name="script.content"><![CDATA[#!/bin/bash
-# black magic
-source /usr/share/Modules/init/bash
-
-module load pixi
-module load gcc/11.3.0
-pixi run remove-artifacts
-pixi run build-libribasim]]></param>
-          <param name="teamcity.build.workingDir" value="ribasim" />
-          <param name="teamcity.step.mode" value="default" />
-          <param name="use.custom.script" value="true" />
-        </parameters>
-      </runner>
-    </build-runners>
-    <vcs-settings>
-      <vcs-entry-ref root-id="Ribasim_Ribasim">
-        <checkout-rule rule=". =&gt; ribasim" />
-      </vcs-entry-ref>
-    </vcs-settings>
-    <requirements>
-      <equals id="RQ_275" name="teamcity.agent.jvm.os.name" value="Linux" />
-    </requirements>
-    <build-triggers />
-    <build-extensions>
-      <extension id="BUILD_EXT_295" type="commit-status-publisher">
-        <parameters>
-          <param name="github_authentication_type" value="token" />
-          <param name="github_host" value="https://api.github.com" />
-          <param name="publisherId" value="githubStatusPublisher" />
-          <param name="secure:github_access_token" value="credentialsJSON:6b37af71-1f2f-4611-8856-db07965445c0" />
-        </parameters>
-      </extension>
-    </build-extensions>
-    <cleanup />
-  </settings>
-</template>
-
diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.xml
index f9ad518e0..c3bfb6fdc 100644
--- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.xml
+++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildLibribasim.xml
@@ -2,12 +2,10 @@
 <build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="cf391998-fed9-4a22-ae44-8877d1028c10" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
   <name>Build libribasim</name>
   <description />
-  <settings>
+  <settings ref="Ribasim_Linux">
     <options>
       <option name="artifactRules" value="ribasim\build\libribasim =&gt; libribasim.zip" />
-      <option name="cleanBuild" value="true" />
       <option name="executionTimeoutMin" value="120" />
-      <option name="publishArtifactCondition" value="SUCCESSFUL" />
     </options>
     <parameters />
     <build-runners>
@@ -46,9 +44,7 @@ pixi run build-libribasim]]></param>
         <checkout-rule rule=". =&gt; ribasim" />
       </vcs-entry-ref>
     </vcs-settings>
-    <requirements>
-      <equals id="RQ_275" name="teamcity.agent.jvm.os.name" value="Linux" />
-    </requirements>
+    <requirements />
     <build-triggers />
     <build-extensions>
       <extension id="BUILD_EXT_295" type="commit-status-publisher">
diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildRibasimCli.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildRibasimCli.xml
index dc2bffb65..60a02eca6 100644
--- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildRibasimCli.xml
+++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_BuildRibasimCli.xml
@@ -2,10 +2,9 @@
 <build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="462d0792-8baa-4071-b8e6-90cfafe9495e" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
   <name>Build ribasim_cli</name>
   <description />
-  <settings>
+  <settings ref="Ribasim_Linux">
     <options>
       <option name="artifactRules" value="ribasim\build/ribasim_cli =&gt; ribasim_cli_linux.zip" />
-      <option name="cleanBuild" value="true" />
       <option name="executionTimeoutMin" value="120" />
     </options>
     <parameters />
@@ -70,3 +69,4 @@ pixi run build-ribasim-cli]]></param>
     <cleanup />
   </settings>
 </build-type>
+
diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml
index 56c94aaa9..3230bb3f1 100644
--- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml
+++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimApi.xml
@@ -2,12 +2,10 @@
 <build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="7bd3078e-0f15-487c-b9d6-dd3417d60fe6" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
   <name>Test ribasim_api</name>
   <description />
-  <settings>
+  <settings ref="Ribasim_Linux">
     <options>
       <option name="artifactRules" value="ribasim\python\ribasim_api\tests\temp =&gt; test_output.zip" />
-      <option name="cleanBuild" value="true" />
       <option name="executionTimeoutMin" value="120" />
-      <option name="publishArtifactCondition" value="SUCCESSFUL" />
     </options>
     <parameters>
       <param name="conda_env_path" value="%system.teamcity.build.checkoutDir%/libribasim_test_env" />
@@ -49,7 +47,6 @@ pixi run test-ribasim-api]]></param>
     </vcs-settings>
     <requirements>
       <does-not-equal id="RQ_315" name="env.OS" value="Windows_NT" />
-      <equals id="RQ_275" name="teamcity.agent.jvm.os.name" value="Linux" />
     </requirements>
     <build-triggers>
       <build-trigger id="TRIGGER_642" type="schedulingTrigger">
diff --git a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml
index 1892b5879..32fbf86f1 100644
--- a/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml
+++ b/.teamcity/Ribasim_Linux/buildTypes/Ribasim_Linux_TestRibasimCli.xml
@@ -2,12 +2,10 @@
 <build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="33150291-268d-4891-8743-ff91dc4e2ba4" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
   <name>Test ribasim_cli</name>
   <description />
-  <settings>
+  <settings ref="Ribasim_Linux">
     <options>
       <option name="artifactRules" value="ribasim\build\tests\temp =&gt; test_output.zip" />
-      <option name="cleanBuild" value="true" />
       <option name="executionTimeoutMin" value="120" />
-      <option name="publishArtifactCondition" value="SUCCESSFUL" />
     </options>
     <parameters>
       <param name="conda_env_path" value="%system.teamcity.build.checkoutDir%/ribasim_cli_test_env" />
@@ -49,7 +47,6 @@ pixi run test-ribasim-cli]]></param>
     </vcs-settings>
     <requirements>
       <does-not-equal id="RQ_310" name="env.OS" value="Windows_NT" />
-      <equals id="RQ_275" name="teamcity.agent.jvm.os.name" value="Linux" />
     </requirements>
     <build-triggers>
       <build-trigger id="TRIGGER_645" type="schedulingTrigger">
diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_Build.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_Build.xml
deleted file mode 100644
index d2d6be2b8..000000000
--- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_Build.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<template xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="8d8feddb-d93b-4f56-a7de-d7423c535eb5" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
-  <name>Build</name>
-  <settings>
-    <options>
-      <option name="artifactRules" value="ribasim\build\libribasim =&gt; libribasim.zip" />
-      <option name="cleanBuild" value="true" />
-      <option name="executionTimeoutMin" value="120" />
-      <option name="publishArtifactCondition" value="SUCCESSFUL" />
-    </options>
-    <parameters />
-    <build-runners>
-      <runner id="RUNNER_2415" name="Set up pixi" type="simpleRunner">
-        <parameters>
-          <param name="script.content"><![CDATA[pixi --version
-pixi run --environment=dev install-ci]]></param>
-          <param name="teamcity.build.workingDir" value="ribasim" />
-          <param name="teamcity.step.mode" value="default" />
-          <param name="use.custom.script" value="true" />
-        </parameters>
-      </runner>
-      <runner id="RUNNER_2416" name="Build binary" type="simpleRunner">
-        <parameters>
-          <param name="script.content"><![CDATA[pixi run remove-artifacts
-pixi run build-libribasim]]></param>
-          <param name="teamcity.build.workingDir" value="ribasim" />
-          <param name="teamcity.step.mode" value="default" />
-          <param name="use.custom.script" value="true" />
-        </parameters>
-      </runner>
-    </build-runners>
-    <vcs-settings>
-      <vcs-entry-ref root-id="Ribasim_Ribasim">
-        <checkout-rule rule=". =&gt; ribasim" />
-      </vcs-entry-ref>
-    </vcs-settings>
-    <requirements>
-      <equals id="RQ_275" name="env.OS" value="Windows_NT" />
-    </requirements>
-    <build-triggers />
-    <build-extensions>
-      <extension id="BUILD_EXT_295" type="commit-status-publisher">
-        <parameters>
-          <param name="github_authentication_type" value="token" />
-          <param name="github_host" value="https://api.github.com" />
-          <param name="publisherId" value="githubStatusPublisher" />
-          <param name="secure:github_access_token" value="credentialsJSON:6b37af71-1f2f-4611-8856-db07965445c0" />
-        </parameters>
-      </extension>
-    </build-extensions>
-    <cleanup />
-  </settings>
-</template>
-
diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildLibribasim.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildLibribasim.xml
index 2f95b2615..5ab8cce3f 100644
--- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildLibribasim.xml
+++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildLibribasim.xml
@@ -2,19 +2,55 @@
 <build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="f6699718-828b-4898-bfab-36de06ae4070" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
   <name>Build libribasim</name>
   <description />
-  <settings ref="Ribasim_Windows_Build">
+  <settings ref="Ribasim_Windows">
+    <options>
+      <option name="artifactRules" value="ribasim\build\libribasim =&gt; libribasim.zip" />
+      <option name="executionTimeoutMin" value="120" />
+      <option name="publishArtifactCondition" value="SUCCESSFUL" />
+    </options>
     <disabled-settings>
       <setting-ref ref="RQ_275" />
-      <setting-ref ref="RUNNER_2415" />
-      <setting-ref ref="RUNNER_2416" />
     </disabled-settings>
     <parameters />
-    <build-runners />
-    <vcs-settings />
+    <build-runners>
+      <runner id="RUNNER_2415" name="Set up pixi" type="simpleRunner">
+        <parameters>
+          <param name="script.content"><![CDATA[pixi --version
+pixi run --environment=dev install-ci]]></param>
+          <param name="teamcity.build.workingDir" value="ribasim" />
+          <param name="teamcity.step.mode" value="default" />
+          <param name="use.custom.script" value="true" />
+        </parameters>
+      </runner>
+      <runner id="RUNNER_2416" name="Build binary" type="simpleRunner">
+        <parameters>
+          <param name="script.content"><![CDATA[pixi run remove-artifacts
+pixi run build-libribasim]]></param>
+          <param name="teamcity.build.workingDir" value="ribasim" />
+          <param name="teamcity.step.mode" value="default" />
+          <param name="use.custom.script" value="true" />
+        </parameters>
+      </runner>
+    </build-runners>
+    <vcs-settings>
+      <vcs-entry-ref root-id="Ribasim_Ribasim">
+        <checkout-rule rule=". =&gt; ribasim" />
+      </vcs-entry-ref>
+    </vcs-settings>
     <requirements>
-      <contains id="RQ_417" name="teamcity.agent.jvm.os.name" value="Windows" />
+      <equals id="RQ_275" name="env.OS" value="Windows_NT" />
     </requirements>
     <build-triggers />
+    <build-extensions>
+      <extension id="BUILD_EXT_295" type="commit-status-publisher">
+        <parameters>
+          <param name="github_authentication_type" value="token" />
+          <param name="github_host" value="https://api.github.com" />
+          <param name="publisherId" value="githubStatusPublisher" />
+          <param name="secure:github_access_token" value="credentialsJSON:6b37af71-1f2f-4611-8856-db07965445c0" />
+        </parameters>
+      </extension>
+    </build-extensions>
     <cleanup />
   </settings>
 </build-type>
diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasimCli.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasimCli.xml
index f9c3f4f6a..9ff25e3d1 100644
--- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasimCli.xml
+++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasimCli.xml
@@ -2,10 +2,9 @@
 <build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="d8d579b4-0968-4ed7-83e7-e14c1cae8683" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
   <name>Build ribasim_cli</name>
   <description />
-  <settings>
+  <settings ref="Ribasim_Windows">
     <options>
       <option name="artifactRules" value="ribasim\build/ribasim_cli =&gt; ribasim_cli_windows.zip" />
-      <option name="cleanBuild" value="true" />
       <option name="executionTimeoutMin" value="120" />
     </options>
     <parameters />
@@ -58,3 +57,4 @@ pixi run build-ribasim-cli]]></param>
     <cleanup />
   </settings>
 </build-type>
+
diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml
index bb6b05130..f5be3f027 100644
--- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml
+++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml
@@ -2,10 +2,9 @@
 <build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="27854ba1-bb78-4d7a-b9fd-fecfb86b0393" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
   <name>Test ribasim_api</name>
   <description />
-  <settings>
+  <settings ref="Ribasim_Windows">
     <options>
       <option name="artifactRules" value="ribasim\python\ribasim_api\tests\temp =&gt; test_output.zip" />
-      <option name="cleanBuild" value="true" />
     </options>
     <parameters>
       <param name="conda_env_path" value="%system.teamcity.build.checkoutDir%/libribasim_test_env" />
diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml
index 7edcc1961..643fa02a4 100644
--- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml
+++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml
@@ -2,10 +2,9 @@
 <build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="d5e2515e-f7f0-4248-9df0-928bb0db1362" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
   <name>Test ribasim_cli</name>
   <description />
-  <settings>
+  <settings ref="Ribasim_Windows">
     <options>
       <option name="artifactRules" value="ribasim\build\tests\temp =&gt; test_output.zip" />
-      <option name="cleanBuild" value="true" />
     </options>
     <parameters>
       <param name="conda_env_path" value="%system.teamcity.build.checkoutDir%/ribasim_cli_test_env" />
@@ -97,3 +96,4 @@
     <cleanup />
   </settings>
 </build-type>
+
diff --git a/core/src/Ribasim.jl b/core/src/Ribasim.jl
index 6d6128bb8..f8d027f63 100644
--- a/core/src/Ribasim.jl
+++ b/core/src/Ribasim.jl
@@ -56,6 +56,7 @@ using SciMLBase:
     solve!,
     step!,
     SciMLBase,
+    ReturnCode,
     successful_retcode,
     CallbackSet,
     ODEFunction,
diff --git a/core/src/bmi.jl b/core/src/bmi.jl
index 6595e6390..d598722f8 100644
--- a/core/src/bmi.jl
+++ b/core/src/bmi.jl
@@ -17,16 +17,15 @@ function BMI.update(model::Model)::Model
     return model
 end
 
-function BMI.update_until(model::Model, time)::Model
-    integrator = model.integrator
-    t = integrator.t
+function BMI.update_until(model::Model, time::Float64)::Model
+    (; t) = model.integrator
     dt = time - t
     if dt < 0
         error("The model has already passed the given timestamp.")
     elseif dt == 0
         return model
     else
-        step!(integrator, dt, true)
+        step!(model, dt)
     end
     return model
 end
diff --git a/core/src/callback.jl b/core/src/callback.jl
index fb1918831..22c5fbb49 100644
--- a/core/src/callback.jl
+++ b/core/src/callback.jl
@@ -60,16 +60,6 @@ function create_callbacks(
     )
     push!(callbacks, tabulated_rating_curve_cb)
 
-    if config.allocation.use_allocation
-        allocation_cb = PeriodicCallback(
-            update_allocation!,
-            config.allocation.timestep;
-            initial_affect = false,
-            save_positions = (false, false),
-        )
-        push!(callbacks, allocation_cb)
-    end
-
     # If saveat is a vector which contains 0.0 this callback will still be called
     # at t = 0.0 despite save_start = false
     saveat = saveat isa Vector ? filter(x -> x != 0.0, saveat) : saveat
diff --git a/core/src/main.jl b/core/src/main.jl
index 78d4823ad..1e75e721f 100644
--- a/core/src/main.jl
+++ b/core/src/main.jl
@@ -54,8 +54,7 @@ function main(ARGS::Vector{String})::Cint
         config = Config(arg)
         mkpath(results_path(config, "."))
         open(results_path(config, "ribasim.log"), "w") do io
-            logger =
-                Ribasim.setup_logger(; verbosity = config.logging.verbosity, stream = io)
+            logger = setup_logger(; verbosity = config.logging.verbosity, stream = io)
             with_logger(logger) do
                 cli = (; ribasim_version = string(pkgversion(Ribasim)))
                 (; starttime, endtime) = config
@@ -63,13 +62,13 @@ function main(ARGS::Vector{String})::Cint
                     @warn "The Ribasim version in the TOML config file does not match the used Ribasim CLI version." config.ribasim_version cli.ribasim_version
                 end
                 @info "Starting a Ribasim simulation." cli.ribasim_version starttime endtime
-                model = Ribasim.run(config)
+                model = run(config)
                 if successful_retcode(model)
                     @info "The model finished successfully"
                     return 0
                 end
 
-                t = Ribasim.datetime_since(model.integrator.t, starttime)
+                t = datetime_since(model.integrator.t, starttime)
                 retcode = model.integrator.sol.retcode
                 @error "The model exited at model time $t with return code $retcode.\nSee https://docs.sciml.ai/DiffEqDocs/stable/basics/solution/#retcodes"
                 return 1
diff --git a/core/src/model.jl b/core/src/model.jl
index 241ba2ec6..7ac16aea1 100644
--- a/core/src/model.jl
+++ b/core/src/model.jl
@@ -29,6 +29,9 @@ end
 
 function Model(config_path::AbstractString)::Model
     config = Config(config_path)
+    if !valid_config(config)
+        error("Invalid configuration in TOML.")
+    end
     return Model(config)
 end
 
@@ -44,11 +47,6 @@ function Model(config::Config)::Model
         TimerOutputs.enable_debug_timings(Ribasim)  # causes recompilation (!)
     end
 
-    t_end = seconds_since(config.endtime, config.starttime)
-    if t_end <= 0
-        error("Model starttime is not before endtime.")
-    end
-
     # All data from the database that we need during runtime is copied into memory,
     # so we can directly close it again.
     db = SQLite.DB(db_path)
@@ -114,6 +112,7 @@ function Model(config::Config)::Model
     integral = zeros(length(parameters.pid_control.node_id))
     u0 = ComponentVector{Float64}(; storage, integral)
     # for Float32 this method allows max ~1000 year simulations without accuracy issues
+    t_end = seconds_since(config.endtime, config.starttime)
     @assert eps(t_end) < 3600 "Simulation time too long"
     t0 = zero(t_end)
     timespan = (t0, t_end)
@@ -188,10 +187,51 @@ function SciMLBase.successful_retcode(model::Model)::Bool
 end
 
 """
-    solve!(model::Model)::ODESolution
+    step!(model::Model, dt::Float64)::Model
+
+Take Model timesteps until `t + dt` is reached exactly.
+"""
+function SciMLBase.step!(model::Model, dt::Float64)::Model
+    (; config, integrator) = model
+    (; t) = integrator
+    # If we are at an allocation time, run allocation before the next physical
+    # layer timestep. This allows allocation over period (t, t + dt) to use variables
+    # set over BMI at time t before calling this function.
+    # Also, don't run allocation at t = 0 since there are no flows yet (#1389).
+    ntimes = t / config.allocation.timestep
+    if t > 0 && round(ntimes) ≈ ntimes
+        update_allocation!(integrator)
+    end
+    step!(integrator, dt, true)
+    return model
+end
+
+"""
+    solve!(model::Model)::Model
 
 Solve a Model until the configured `endtime`.
 """
-function SciMLBase.solve!(model::Model)::ODESolution
-    return solve!(model.integrator)
+function SciMLBase.solve!(model::Model)::Model
+    (; config, integrator) = model
+    if config.allocation.use_allocation
+        (; tspan) = integrator.sol.prob
+        (; timestep) = config.allocation
+        allocation_times = timestep:timestep:(tspan[end] - timestep)
+        n_allocation_times = length(allocation_times)
+        # Don't run allocation at t = 0 since there are no flows yet (#1389).
+        step!(integrator, timestep, true)
+        for _ in 1:n_allocation_times
+            update_allocation!(integrator)
+            step!(integrator, timestep, true)
+        end
+
+        if integrator.sol.retcode != ReturnCode.Default
+            return model
+        end
+        # TODO replace with `check_error!` https://github.com/SciML/SciMLBase.jl/issues/669
+        integrator.sol = SciMLBase.solution_new_retcode(integrator.sol, ReturnCode.Success)
+    else
+        solve!(integrator)
+    end
+    return model
 end
diff --git a/core/src/util.jl b/core/src/util.jl
index d84567632..57482cca1 100644
--- a/core/src/util.jl
+++ b/core/src/util.jl
@@ -683,7 +683,7 @@ function get_Δt(integrator)::Float64
     elseif isinf(saveat)
         t
     else
-        t_end = integrator.sol.prob.tspan[2]
+        t_end = integrator.sol.prob.tspan[end]
         if t_end - t > saveat
             saveat
         else
diff --git a/core/src/validation.jl b/core/src/validation.jl
index 9d6a621d2..cf42c6a4c 100644
--- a/core/src/validation.jl
+++ b/core/src/validation.jl
@@ -151,6 +151,17 @@ function sorted_table!(
     return table
 end
 
+function valid_config(config::Config)::Bool
+    errors = false
+
+    if config.starttime >= config.endtime
+        errors = true
+        @error "The model starttime must be before the endtime."
+    end
+
+    return !errors
+end
+
 """
 Test for each node given its node type whether the nodes that
 # are downstream ('down-edge') of this node are of an allowed type