diff --git a/.yarn/cache/axios-retry-npm-4.0.0-4e8652b2f1-132b63132e.zip b/.yarn/cache/axios-retry-npm-4.0.0-4e8652b2f1-132b63132e.zip
new file mode 100644
index 00000000..286f9023
Binary files /dev/null and b/.yarn/cache/axios-retry-npm-4.0.0-4e8652b2f1-132b63132e.zip differ
diff --git a/.yarn/cache/is-retry-allowed-npm-2.2.0-b4b58fc581-3d1103a929.zip b/.yarn/cache/is-retry-allowed-npm-2.2.0-b4b58fc581-3d1103a929.zip
new file mode 100644
index 00000000..e849b484
Binary files /dev/null and b/.yarn/cache/is-retry-allowed-npm-2.2.0-b4b58fc581-3d1103a929.zip differ
diff --git a/README.md b/README.md
index 6d230b2b..db48afba 100644
--- a/README.md
+++ b/README.md
@@ -2280,7 +2280,7 @@ USAGE
   $ mw database mysql delete DATABASE-ID [-q] [-f]
 
 ARGUMENTS
-  DATABASE-ID  The ID of the database (when a project context is set, you can also use the name)
+  DATABASE-ID  The ID or name of the database
 
 FLAGS
   -f, --force  Do not ask for confirmation
@@ -2305,7 +2305,7 @@ USAGE
   $ mw database mysql dump DATABASE-ID -o <value> [-q] [-p <value>] [--ssh-user <value>] [--temporary-user] [--gzip]
 
 ARGUMENTS
-  DATABASE-ID  The ID of the database (when a project context is set, you can also use the name)
+  DATABASE-ID  The ID or name of the database
 
 FLAGS
   -o, --output=<value>          (required) the output file to write the dump to ("-" for stdout)
@@ -2365,7 +2365,7 @@ USAGE
   $ mw database mysql get DATABASE-ID [-o json|yaml |  | ]
 
 ARGUMENTS
-  DATABASE-ID  The ID of the database (when a project context is set, you can also use the name)
+  DATABASE-ID  The ID or name of the database
 
 FLAGS
   -o, --output=<option>  output in a more machine friendly format
@@ -2415,7 +2415,7 @@ USAGE
   $ mw database mysql phpmyadmin DATABASE-ID
 
 ARGUMENTS
-  DATABASE-ID  The ID of the database (when a project context is set, you can also use the name)
+  DATABASE-ID  The ID or name of the database
 ```
 
 ## `mw database mysql port-forward DATABASE-ID`
@@ -2427,7 +2427,7 @@ USAGE
   $ mw database mysql port-forward DATABASE-ID [-q] [--ssh-user <value>] [--port <value>]
 
 ARGUMENTS
-  DATABASE-ID  The ID of the database (when a project context is set, you can also use the name)
+  DATABASE-ID  The ID or name of the database
 
 FLAGS
   -q, --quiet             suppress process output and only display a machine-readable summary.
@@ -2457,7 +2457,7 @@ USAGE
   $ mw database mysql shell DATABASE-ID [-q] [-p <value>]
 
 ARGUMENTS
-  DATABASE-ID  The ID of the database (when a project context is set, you can also use the name)
+  DATABASE-ID  The ID or name of the database
 
 FLAGS
   -p, --mysql-password=<value>  the password to use for the MySQL user (env: MYSQL_PWD)
diff --git a/package.json b/package.json
index d580e284..3679f9d7 100644
--- a/package.json
+++ b/package.json
@@ -32,25 +32,24 @@
     "post:generate": "yarn run -T compile && yarn run -T compile:cjs",
     "test": "yarn test:format && yarn test:licenses && yarn test:unit",
     "test:format": "yarn lint && yarn format --check",
-    "test:unit": "mocha --forbid-only \"src/**/*.test.ts\"",
     "test:licenses": "yarn license-check --summary --unknown --failOn 'UNLICENSED;UNKNOWN'",
-    "test:readme": "yarn generate:readme && git diff --exit-code README.md"
+    "test:readme": "yarn generate:readme && git diff --exit-code README.md",
+    "test:unit": "mocha --forbid-only \"src/**/*.test.ts\""
   },
   "files": [
     ".deps",
-    "dist/**/*.{js,d.ts}",
-    "bin"
+    "bin",
+    "dist/**/*.{js,d.ts}"
   ],
   "dependencies": {
     "@mittwald/api-client": "^4.9.0",
-    "@mittwald/api-client-commons": "^4.2.2",
     "@mittwald/react-use-promise": "^2.1.2",
     "@oclif/core": "^3.18.1",
     "@oclif/plugin-autocomplete": "^3.0.3",
     "@oclif/plugin-help": "^6.0.5",
     "@oclif/plugin-update": "^4.1.3",
     "@oclif/plugin-warn-if-update-available": "^3.0.2",
-    "axios": "^1.5.0",
+    "axios-retry": "^4.0.0",
     "chalk": "^5.3.0",
     "date-fns": "^3.2.0",
     "humanize-string": "^3.0.0",
diff --git a/src/BaseCommand.ts b/src/BaseCommand.ts
index 98e99b4e..874bf7e1 100644
--- a/src/BaseCommand.ts
+++ b/src/BaseCommand.ts
@@ -2,6 +2,8 @@ import { Command } from "@oclif/core";
 import * as fs from "fs/promises";
 import * as path from "path";
 import { MittwaldAPIV2Client } from "@mittwald/api-client";
+import { configureAxiosRetry } from "./lib/api_retry.js";
+import { configureConsistencyHandling } from "./lib/api_consistency.js";
 
 export abstract class BaseCommand extends Command {
   protected authenticationRequired = true;
@@ -17,9 +19,13 @@ export abstract class BaseCommand extends Command {
           `Could not get token from either config file (${this.getTokenFilename()}) or environment`,
         );
       }
+
       this.apiClient = MittwaldAPIV2Client.newWithToken(token);
       this.apiClient.axios.defaults.headers["User-Agent"] =
         `mittwald-cli/${this.config.version}`;
+
+      configureAxiosRetry(this.apiClient.axios);
+      configureConsistencyHandling(this.apiClient.axios);
     }
   }
 
diff --git a/src/commands/database/mysql/create.test.ts b/src/commands/database/mysql/create.test.ts
new file mode 100644
index 00000000..ca3888fb
--- /dev/null
+++ b/src/commands/database/mysql/create.test.ts
@@ -0,0 +1,109 @@
+import { expect, test } from "@oclif/test";
+
+describe("database:mysql:create", () => {
+  const projectId = "339d6458-839f-4809-a03d-78700069690c";
+  const databaseId = "83e0cb85-dcf7-4968-8646-87a63980ae91";
+  const userId = "a8c1eb2a-aa4d-4daf-8e21-9d91d56559ca";
+  const password = "secret";
+  const description = "Test";
+
+  const createFlags = [
+    "database mysql create",
+    "--project-id",
+    projectId,
+    "--version",
+    "8.0",
+    "--description",
+    description,
+    "--user-password",
+    password,
+  ];
+
+  test
+    .nock("https://api.mittwald.de", (api) => {
+      api.get(`/v2/projects/${projectId}`).reply(200, {
+        id: projectId,
+      });
+      api
+        .post(`/v2/projects/${projectId}/mysql-databases`, {
+          database: {
+            projectId,
+            description,
+            version: "8.0",
+            characterSettings: {
+              collation: "utf8mb4_unicode_ci",
+              characterSet: "utf8mb4",
+            },
+          },
+          user: {
+            password,
+            externalAccess: false,
+            accessLevel: "full",
+          },
+        })
+        .reply(201, { id: databaseId, userId });
+
+      api.get(`/v2/mysql-databases/${databaseId}`).reply(200, {
+        id: databaseId,
+        name: "mysql_xxxxxx",
+      });
+
+      api.get(`/v2/mysql-users/${userId}`).reply(200, {
+        id: userId,
+        name: "dbu_xxxxxx",
+      });
+    })
+    .env({ MITTWALD_API_TOKEN: "foo" })
+    .stdout()
+    .command(createFlags)
+    .it("creates a database and prints database and user name", (ctx) => {
+      // cannot match on exact output, because linebreaks
+      expect(ctx.stdout).to.contain("The database mysql_xxxxxx");
+      expect(ctx.stdout).to.contain("the user dbu_xxxxxx");
+    });
+
+  test
+    .nock("https://api.mittwald.de", (api) => {
+      api.get(`/v2/projects/${projectId}`).reply(200, {
+        id: projectId,
+      });
+      api
+        .post(`/v2/projects/${projectId}/mysql-databases`, {
+          database: {
+            projectId,
+            description: "Test",
+            version: "8.0",
+            characterSettings: {
+              collation: "utf8mb4_unicode_ci",
+              characterSet: "utf8mb4",
+            },
+          },
+          user: {
+            password: "secret",
+            externalAccess: false,
+            accessLevel: "full",
+          },
+        })
+        .reply(201, { id: databaseId, userId });
+
+      api.get(`/v2/mysql-databases/${databaseId}`).reply(200, {
+        id: databaseId,
+        name: "mysql_xxxxxx",
+      });
+
+      api.get(`/v2/mysql-users/${userId}`).times(3).reply(403);
+
+      api.get(`/v2/mysql-users/${userId}`).reply(200, {
+        id: userId,
+        name: "dbu_xxxxxx",
+      });
+    })
+    .env({ MITTWALD_API_TOKEN: "foo" })
+    .stdout()
+    .command(createFlags)
+    .it("retries fetching user until successful", (ctx) => {
+      // cannot match on exact output, because linebreaks
+      expect(ctx.stdout).to.contain("The database mysql_xxxxxx");
+      expect(ctx.stdout).to.contain("the user dbu_xxxxxx");
+    });
+});
diff --git a/src/commands/database/mysql/create.tsx b/src/commands/database/mysql/create.tsx
index 5ba032b9..a83bc509 100644
--- a/src/commands/database/mysql/create.tsx
+++ b/src/commands/database/mysql/create.tsx
@@ -11,6 +11,10 @@ import { Text } from "ink";
 import { assertStatus } from "@mittwald/api-client-commons";
 import { Success } from "../../../rendering/react/components/Success.js";
 import { Value } from "../../../rendering/react/components/Value.js";
+import type { MittwaldAPIV2 } from "@mittwald/api-client";
+
+type Database = MittwaldAPIV2.Components.Schemas.DatabaseMySqlDatabase;
+type User = MittwaldAPIV2.Components.Schemas.DatabaseMySqlUser;
 
 type Result = {
   databaseId: string;
@@ -71,59 +75,76 @@ export class Create extends ExecRenderBaseCommand<typeof Create, Result> {
 
     const password = await this.getPassword(p);
 
-    const db = await p.runStep("creating MySQL database", async () => {
-      const r = await this.apiClient.database.createMysqlDatabase({
-        projectId,
-        data: {
-          database: {
-            projectId,
-            description,
-            version,
-            characterSettings: {
-              collation,
-              characterSet,
-            },
-          },
-          user: {
-            password,
-            externalAccess,
-            accessLevel: accessLevel as "full" | "readonly",
-          },
+    const db = await this.createMySQLDatabase(
+      p,
+      projectId,
+      {
+        description,
+        version,
+        characterSettings: {
+          collation,
+          characterSet,
         },
-      });
-
-      assertStatus(r, 201);
-      return r.data;
-    });
+      },
+      {
+        password,
+        externalAccess,
+        accessLevel: accessLevel as "full" | "readonly",
+      },
+    );
 
     const database = await p.runStep("fetching database", async () => {
-      const r = await this.apiClient.database.getMysqlDatabase({
+      const response = await this.apiClient.database.getMysqlDatabase({
         mysqlDatabaseId: db.id,
       });
-      assertStatus(r, 200);
-
-      return r.data;
+      assertStatus(response, 200);
+      return response.data;
     });
 
     const user = await p.runStep("fetching user", async () => {
-      const r = await this.apiClient.database.getMysqlUser({
+      const response = await this.apiClient.database.getMysqlUser({
         mysqlUserId: db.userId,
       });
-      assertStatus(r, 200);
-
-      return r.data;
+      assertStatus(response, 200);
+      return response.data;
     });
 
-    p.complete(
-      <Success>
-        The database <Value>{database.name}</Value> and the user{" "}
-        <Value>{user.name}</Value> were successfully created.
-      </Success>,
-    );
+    await p.complete(<DatabaseCreateSuccess database={database} user={user} />);
 
     return { databaseId: db.id, userId: db.userId };
   }
 
+  private async createMySQLDatabase(
+    p: ProcessRenderer,
+    projectId: string,
+    database: {
+      description: string;
+      version: string;
+      characterSettings: {
+        collation: string;
+        characterSet: string;
+      };
+    },
+    user: {
+      password: string;
+      externalAccess: boolean;
+      accessLevel: "full" | "readonly";
+    },
+  ) {
+    return await p.runStep("creating MySQL database", async () => {
+      const r = await this.apiClient.database.createMysqlDatabase({
+        projectId,
+        data: {
+          database: { projectId, ...database },
+          user,
+        },
+      });
+
+      assertStatus(r, 201);
+      return r.data;
+    });
+  }
+
   private async getPassword(p: ProcessRenderer): Promise<string> {
     if (this.flags["user-password"]) {
       return this.flags["user-password"];
@@ -138,3 +159,18 @@ export class Create extends ExecRenderBaseCommand<typeof Create, Result> {
     }
   }
 }
+
+function DatabaseCreateSuccess({
+  database,
+  user,
+}: {
+  database: Database;
+  user: User;
+}) {
+  return (
+    <Success>
+      The database <Value>{database.name}</Value> and the user{" "}
+      <Value>{user.name}</Value> were successfully created.
+    </Success>
+  );
+}
diff --git a/src/commands/database/mysql/delete.ts b/src/commands/database/mysql/delete.ts
index f584fb9c..b30b7146 100644
--- a/src/commands/database/mysql/delete.ts
+++ b/src/commands/database/mysql/delete.ts
@@ -15,7 +15,6 @@ export default class Delete extends DeleteBaseCommand<typeof Delete> {
       this.apiClient,
       this.flags,
       this.args,
-      this.config,
     );
     const response = await this.apiClient.database.deleteMysqlDatabase({
       mysqlDatabaseId,
diff --git a/src/commands/database/mysql/dump.tsx b/src/commands/database/mysql/dump.tsx
index c205f369..b31a33ed 100644
--- a/src/commands/database/mysql/dump.tsx
+++ b/src/commands/database/mysql/dump.tsx
@@ -58,12 +58,7 @@ export class Dump extends ExecRenderBaseCommand<
   static args = { ...mysqlArgs };
 
   protected async exec(): Promise<Record<string, never>> {
-    const databaseId = await withMySQLId(
-      this.apiClient,
-      this.flags,
-      this.args,
-      this.config,
-    );
+    const databaseId = await withMySQLId(this.apiClient, this.flags, this.args);
     const p = makeProcessRenderer(this.flags, "Dumping a MySQL database");
 
     const connectionDetails = await getConnectionDetailsWithPassword(
diff --git a/src/commands/database/mysql/get.ts b/src/commands/database/mysql/get.ts
index 14a1ae3c..a2cd5306 100644
--- a/src/commands/database/mysql/get.ts
+++ b/src/commands/database/mysql/get.ts
@@ -21,7 +21,6 @@ export abstract class Get extends GetBaseCommand<typeof Get, APIResponse> {
       this.apiClient,
       this.flags,
       this.args,
-      this.config,
     );
     return await this.apiClient.database.getMysqlDatabase({
       mysqlDatabaseId,
diff --git a/src/commands/database/mysql/phpmyadmin.ts b/src/commands/database/mysql/phpmyadmin.ts
index de5648d6..89d2c67a 100644
--- a/src/commands/database/mysql/phpmyadmin.ts
+++ b/src/commands/database/mysql/phpmyadmin.ts
@@ -10,12 +10,7 @@ export class PhpMyAdmin extends BaseCommand {
 
   public async run(): Promise<void> {
     const { flags, args } = await this.parse(PhpMyAdmin);
-    const databaseId = await withMySQLId(
-      this.apiClient,
-      flags,
-      args,
-      this.config,
-    );
+    const databaseId = await withMySQLId(this.apiClient, flags, args);
     const users = await this.apiClient.database.listMysqlUsers({
       mysqlDatabaseId: databaseId,
     });
diff --git a/src/commands/database/mysql/port-forward.tsx b/src/commands/database/mysql/port-forward.tsx
index 0c38efbb..556b1500 100644
--- a/src/commands/database/mysql/port-forward.tsx
+++ b/src/commands/database/mysql/port-forward.tsx
@@ -28,12 +28,7 @@ export class PortForward extends ExecRenderBaseCommand<
   static args = { ...mysqlArgs };
 
   protected async exec(): Promise<Record<string, never>> {
-    const databaseId = await withMySQLId(
-      this.apiClient,
-      this.flags,
-      this.args,
-      this.config,
-    );
+    const databaseId = await withMySQLId(this.apiClient, this.flags, this.args);
     const p = makeProcessRenderer(
       this.flags,
       "Port-forwarding a MySQL database",
diff --git a/src/commands/database/mysql/shell.tsx b/src/commands/database/mysql/shell.tsx
index 48f29670..502633df 100644
--- a/src/commands/database/mysql/shell.tsx
+++ b/src/commands/database/mysql/shell.tsx
@@ -25,12 +25,7 @@ export class Shell extends ExecRenderBaseCommand<
   static args = { ...mysqlArgs };
 
   protected async exec(): Promise<Record<string, never>> {
-    const databaseId = await withMySQLId(
-      this.apiClient,
-      this.flags,
-      this.args,
-      this.config,
-    );
+    const databaseId = await withMySQLId(this.apiClient, this.flags, this.args);
     const p = makeProcessRenderer(this.flags, "Starting a MySQL shell");
 
     const { sshUser, sshHost, user, hostname, database, password } =
diff --git a/src/commands/project/create.tsx b/src/commands/project/create.tsx
index 8a991b84..0764cec7 100644
--- a/src/commands/project/create.tsx
+++ b/src/commands/project/create.tsx
@@ -47,7 +47,6 @@ export default class Create extends ExecRenderBaseCommand<
     });
 
     assertStatus(result, 201);
-    const eventId = result.headers["etag"];
 
     stepCreating.complete();
     process.addInfo(
@@ -64,7 +63,6 @@ export default class Create extends ExecRenderBaseCommand<
       await waitUntil(async () => {
         const projectResponse = await this.apiClient.project.getProject({
           projectId: result.data.id,
-          headers: { "if-event-reached": eventId },
         });
 
         if (
diff --git a/src/lib/api_consistency.ts b/src/lib/api_consistency.ts
new file mode 100644
index 00000000..bcbb6791
--- /dev/null
+++ b/src/lib/api_consistency.ts
@@ -0,0 +1,33 @@
+import { AxiosHeaders, AxiosInstance } from "@mittwald/api-client-commons";
+import debug from "debug";
+
+const d = debug("mw:api-consistency");
+
+export function configureConsistencyHandling(axios: AxiosInstance) {
+  let lastEventId: string | undefined = undefined;
+
+  axios.interceptors.request.use((config) => {
+    if (lastEventId !== undefined) {
+      d("setting if-event-reached to %o", lastEventId);
+      config.headers["if-event-reached"] = lastEventId;
+    }
+    return config;
+  });
+
+  axios.interceptors.response.use((response) => {
+    const isMutatingRequest =
+      ["post", "put", "delete", "patch"].indexOf(
+        response.config?.method?.toLowerCase() ?? "",
+      ) >= 0;
+    const headers = response.headers as AxiosHeaders;
+
+    if (headers.has("etag") && isMutatingRequest) {
+      d(
+        "setting last event id to %o after mutating request",
+        headers.get("etag"),
+      );
+      lastEventId = headers.get("etag") as string;
+    }
+    return response;
+  });
+}
diff --git a/src/lib/api_retry.ts b/src/lib/api_retry.ts
new file mode 100644
index 00000000..0bd25cbc
--- /dev/null
+++ b/src/lib/api_retry.ts
@@ -0,0 +1,36 @@
+import { AxiosInstance } from "@mittwald/api-client-commons";
+import debug from "debug";
+import axiosRetry from "axios-retry";
+
+const d = debug("mw:api-retry");
+
+export function configureAxiosRetry(axios: AxiosInstance) {
+  axios.interceptors.request.use((config) => {
+    return {
+      ...config,
+      validateStatus: (status) => status < 300,
+    };
+  });
+
+  axiosRetry(axios, {
+    retries: 10,
+    retryDelay: axiosRetry.exponentialDelay,
+    onRetry(count, error) {
+      d("retrying request after %d attempts; error: %o", count, error.message);
+    },
+    retryCondition(error) {
+      if (error.code === "ERR_FR_TOO_MANY_REDIRECTS") {
+        return false;
+      }
+
+      if (axiosRetry.isNetworkOrIdempotentRequestError(error)) {
+        return true;
+      }
+
+      const isSafeRequest = error.config?.method?.toLowerCase() === "get";
+      const isAccessDenied = error.response?.status === 403;
+
+      return isSafeRequest && isAccessDenied;
+    },
+  });
+}
diff --git a/src/lib/app/Installer.tsx b/src/lib/app/Installer.tsx
index 5674fe28..405a393a 100644
--- a/src/lib/app/Installer.tsx
+++ b/src/lib/app/Installer.tsx
@@ -87,7 +87,7 @@ export class AppInstaller<TFlagName extends AvailableFlagName> {
       this.appId,
     );
 
-    const [appInstallationId, eventId] = await triggerAppInstallation(
+    const appInstallationId = await triggerAppInstallation(
       apiClient,
       process,
       projectId,
@@ -97,12 +97,7 @@ export class AppInstaller<TFlagName extends AvailableFlagName> {
 
     let successText: string;
     if (flags.wait) {
-      await waitUntilAppIsInstalled(
-        apiClient,
-        process,
-        appInstallationId,
-        eventId,
-      );
+      await waitUntilAppIsInstalled(apiClient, process, appInstallationId);
       successText = `Your ${this.appName} installation is now complete. Have fun! 🎉`;
     } else {
       successText = `Your ${this.appName} installation has started. Have fun when it's ready! 🎉`;
diff --git a/src/lib/app/install.ts b/src/lib/app/install.ts
index fab8c428..f3d57a3c 100644
--- a/src/lib/app/install.ts
+++ b/src/lib/app/install.ts
@@ -10,10 +10,10 @@ export async function triggerAppInstallation(
   projectId: string,
   flags: Record<string, string>,
   appVersion: AppAppVersion,
-) {
-  const [appInstallationId, eventId] = await process.runStep(
+): Promise<string> {
+  const appInstallationId = await process.runStep(
     "starting installation",
-    async (): Promise<[string, string]> => {
+    async (): Promise<string> => {
       const result = await apiClient.app.requestAppinstallation({
         projectId,
         data: {
@@ -28,7 +28,7 @@ export async function triggerAppInstallation(
       });
 
       assertStatus(result, 201);
-      return [result.data.id, result.headers["etag"]];
+      return result.data.id;
     },
   );
 
@@ -52,7 +52,6 @@ export async function triggerAppInstallation(
     await process.runStep("setting document root", async () => {
       const result = await apiClient.app.patchAppinstallation({
         appInstallationId,
-        headers: { "if-event-reached": eventId },
         data: {
           customDocumentRoot: flags["document-root"],
         },
@@ -62,5 +61,5 @@ export async function triggerAppInstallation(
     });
   }
 
-  return [appInstallationId, eventId];
+  return appInstallationId;
 }
diff --git a/src/lib/app/wait.tsx b/src/lib/app/wait.tsx
index cf44ef2e..783d01ac 100644
--- a/src/lib/app/wait.tsx
+++ b/src/lib/app/wait.tsx
@@ -8,7 +8,6 @@ export async function waitUntilAppIsInstalled(
   apiClient: MittwaldAPIV2Client,
   process: ProcessRenderer,
   appInstallationId: string,
-  eventId: string,
 ) {
   const stepWaiting = process.addStep(
     <Text>waiting for app installation to be ready</Text>,
@@ -17,8 +16,6 @@ export async function waitUntilAppIsInstalled(
   await waitUntil(async () => {
     const installationResponse = await apiClient.app.getAppinstallation({
       appInstallationId,
-      // TODO: Remove once @mittwald/api-client supports this
-      headers: { "if-event-reached": eventId } as any, // eslint-disable-line
     });
 
     if (
diff --git a/src/lib/database/mysql/flags.ts b/src/lib/database/mysql/flags.ts
index 0d85f86d..ce4a0806 100644
--- a/src/lib/database/mysql/flags.ts
+++ b/src/lib/database/mysql/flags.ts
@@ -1,8 +1,6 @@
-import { Args, Config, Flags } from "@oclif/core";
+import { Args, Flags } from "@oclif/core";
 import { MittwaldAPIV2Client } from "@mittwald/api-client";
 import { ArgOutput, FlagOutput } from "@oclif/core/lib/interfaces/parser.js";
-import { isUuid } from "../../../normalize_id.js";
-import { withProjectId } from "../../project/flags.js";
 import { assertStatus } from "@mittwald/api-client-commons";
 
 export const mysqlConnectionFlags = {
@@ -21,8 +19,7 @@ NOTE: This is a security risk, as the password will be visible in the process li
 
 export const mysqlArgs = {
   "database-id": Args.string({
-    description:
-      "The ID of the database (when a project context is set, you can also use the name)",
+    description: "The ID or name of the database",
     required: true,
   }),
 };
@@ -43,24 +40,13 @@ export async function withMySQLId(
   apiClient: MittwaldAPIV2Client,
   flags: FlagOutput,
   args: ArgOutput,
-  cfg: Config,
 ): Promise<string> {
-  const candidate = getIdCandidate(flags, args);
-  if (isUuid(candidate)) {
-    return candidate;
-  }
-
-  const projectId = await withProjectId(apiClient, "flag", flags, args, cfg);
-  const databases = await apiClient.database.listMysqlDatabases({
-    projectId,
+  const mysqlDatabaseId = getIdCandidate(flags, args);
+  const response = await apiClient.database.getMysqlDatabase({
+    mysqlDatabaseId,
   });
 
-  assertStatus(databases, 200);
-
-  const database = databases.data.find((db) => db.name === candidate);
-  if (!database) {
-    throw new Error(`No database with name "${candidate}" found`);
-  }
+  assertStatus(response, 200);
 
-  return database.id;
+  return response.data.id;
 }
diff --git a/yarn.lock b/yarn.lock
index f0360068..4db1655b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1530,7 +1530,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@mittwald/api-client-commons@npm:^4.10.0, @mittwald/api-client-commons@npm:^4.2.2":
+"@mittwald/api-client-commons@npm:^4.10.0":
   version: 4.10.0
   resolution: "@mittwald/api-client-commons@npm:4.10.0"
   dependencies:
@@ -1568,7 +1568,6 @@ __metadata:
   resolution: "@mittwald/cli@workspace:."
   dependencies:
     "@mittwald/api-client": ^4.9.0
-    "@mittwald/api-client-commons": ^4.2.2
     "@mittwald/react-use-promise": ^2.1.2
     "@oclif/core": ^3.18.1
     "@oclif/plugin-autocomplete": ^3.0.3
@@ -1591,7 +1590,7 @@ __metadata:
     "@typescript-eslint/eslint-plugin": ^7.1.0
     "@typescript-eslint/parser": ^7.0.2
     "@yarnpkg/pnpify": ^4.0.0-rc.48
-    axios: ^1.5.0
+    axios-retry: ^4.0.0
     chalk: ^5.3.0
     date-fns: ^3.2.0
     eslint: ^8.44.0
@@ -4275,7 +4274,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:^1.5.0, axios@npm:^1.6.7":
+"axios-retry@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "axios-retry@npm:4.0.0"
+  dependencies:
+    is-retry-allowed: ^2.2.0
+  peerDependencies:
+    axios: 0.x || 1.x
+  checksum: 132b63132e8087242b8888fdebf3786cfd687e1021970319336a63533b4b584ab23a39d5b5a05e84b96055a640129a25e60b6a6cdb422c4cf10517398238000f
+  languageName: node
+  linkType: hard
+
+"axios@npm:^1.6.7":
   version: 1.6.7
   resolution: "axios@npm:1.6.7"
   dependencies:
@@ -7109,6 +7119,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-retry-allowed@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "is-retry-allowed@npm:2.2.0"
+  checksum: 3d1103a9290b5d03626756a41054844633eac78bc5d3e3a95b13afeae94fa3cfbcf7f0b5520d83f75f48a25ce7b142fdbac4217dc4b0630f3ea55e866ec3a029
+  languageName: node
+  linkType: hard
+
 "is-scoped@npm:^2.1.0":
   version: 2.1.0
   resolution: "is-scoped@npm:2.1.0"