diff --git a/.github/workflows/fail-on-prerelease.yml b/.github/workflows/fail-on-prerelease.yml
deleted file mode 100644
index a5b876c3..00000000
--- a/.github/workflows/fail-on-prerelease.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: Block if prerelease is present
-
-on:
-  pull_request:
-
-permissions:
-  contents: read
-
-jobs:
-  check-latest-release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Check latest published release isn't a prerelease"
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v6
-        with:
-          script: |
-            const tags = await github.rest.repos.listTags({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              per_page: 1
-            });
-
-            if (!tags.data || tags.data.length === 0) {
-              core.info('No tags found for this repository; skipping prerelease check.');
-              return;
-            }
-
-            const latestTag = tags.data[0].name;
-            core.info(`Latest tag found: ${latestTag}`);
-
-            try {
-              const { data } = await github.rest.repos.getReleaseByTag({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                tag: latestTag
-              });
-
-              if (data.prerelease) {
-                core.setFailed(`Release for tag ${latestTag} (${data.tag_name}) is a prerelease. Blocking merges to main as we need to wait for the prerelease to become stable.`);
-              } else {
-                core.info(`Release for tag ${latestTag} (${data.tag_name}) is not a prerelease.`);
-              }
-
-            } catch (err) {
-              if (err.status === 404) {
-                core.info(`No release found for tag ${latestTag}; skipping prerelease check.`);
-              } else {
-                throw err;
-              }
-            }
diff --git a/Containers/mastercontainer/daily-backup.sh b/Containers/mastercontainer/daily-backup.sh
index 89ef3cd5..d11f3e85 100644
--- a/Containers/mastercontainer/daily-backup.sh
+++ b/Containers/mastercontainer/daily-backup.sh
@@ -4,7 +4,7 @@ echo "Daily backup script has started"
 
 # Check if initial configuration has been done, otherwise this script should do nothing.
 CONFIG_FILE=/mnt/docker-aio-config/data/configuration.json
-if ! [ -f "$CONFIG_FILE" ] || (! grep -q "wasStartButtonClicked.*1" "$CONFIG_FILE" && ! grep -q "wasStartButtonClicked.*true" "$CONFIG_FILE"); then
+if ! [ -f "$CONFIG_FILE" ] || ! grep -q "wasStartButtonClicked.*1" "$CONFIG_FILE"; then
     echo "Initial configuration via AIO interface not done yet. Exiting..."
     exit 0
 fi
diff --git a/community-containers/local-ai/local-ai.json b/community-containers/local-ai/local-ai.json
index e906b5a7..fceb4394 100644
--- a/community-containers/local-ai/local-ai.json
+++ b/community-containers/local-ai/local-ai.json
@@ -50,7 +50,7 @@
             "nextcloud_exec_commands": [
                 "php /var/www/html/occ app:install integration_openai",
                 "php /var/www/html/occ app:enable integration_openai",
-                "php /var/www/html/occ config:app:set integration_openai url --value http://nextcloud-aio-local-ai:10078",
+                "php /var/www/html/occ config:app:set integration_openai url --value http://nextcloud-aio-local-ai:8080",
                 "php /var/www/html/occ config:app:set integration_openai api_key --value %LOCALAI_API_KEY%",
                 "php /var/www/html/occ app:install assistant",
                 "php /var/www/html/occ app:enable assistant"
diff --git a/php/src/Controller/ConfigurationController.php b/php/src/Controller/ConfigurationController.php
index c40ee98c..bb55e10f 100644
--- a/php/src/Controller/ConfigurationController.php
+++ b/php/src/Controller/ConfigurationController.php
@@ -17,7 +17,6 @@ readonly class ConfigurationController {
 
     public function SetConfig(Request $request, Response $response, array $args): Response {
         try {
-            $this->configurationManager->startTransaction();
             if (isset($request->getParsedBody()['domain'])) {
                 $domain = $request->getParsedBody()['domain'] ?? '';
                 $skipDomainValidation = isset($request->getParsedBody()['skip_domain_validation']);
@@ -138,8 +137,6 @@ readonly class ConfigurationController {
         } catch (InvalidSettingConfigurationException $ex) {
             $response->getBody()->write($ex->getMessage());
             return $response->withStatus(422);
-        } finally {
-            $this->configurationManager->commitTransaction();
         }
     }
 }
diff --git a/php/templates/includes/aio-version.twig b/php/templates/includes/aio-version.twig
index 1b62f917..062985d4 100644
--- a/php/templates/includes/aio-version.twig
+++ b/php/templates/includes/aio-version.twig
@@ -1 +1 @@
-12.6.1
+12.6.0