diff --git a/docker/local/docker-compose.yml b/docker/local/docker-compose.yml
index f77a2df10a..01e8325cac 100644
--- a/docker/local/docker-compose.yml
+++ b/docker/local/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
     postgres:
-        image: postgres:18-alpine
+        image: docker.io/library/postgres:18-alpine
         tmpfs: /pgtmpfs
         logging:
             driver: "none"
diff --git a/package.json b/package.json
index 160ca6c6d1..1a3b07103c 100644
--- a/package.json
+++ b/package.json
@@ -15,10 +15,10 @@
 		"clean:all": "pnpm run clean && pnpm run clean:node_modules",
 		"clean:node_modules": "rm -rf packages/*/node_modules && rm -rf node_modules",
 		"clean:packages": "rm -rf packages/*/distribution && rm -f packages/*/tsconfig.tsbuildinfo && lerna run clean --parallel",
+		"container": "scripts/container-cli.sh",
 		"deps": "cross-env-shell ./scripts/deps/update.sh",
 		"deps:check": "node ./scripts/deps/check.js",
 		"deps:types": "./node_modules/typesync/bin/typesync",
-		"docker": "node ./scripts/docker/generate-docker.js",
 		"format": "pnpm run lint && pnpm run prettier",
 		"lint": "eslint packages/*/source --fix",
 		"lint:dry": "eslint packages/*/source",
@@ -26,9 +26,9 @@
 		"lint:test": "eslint packages/ --ext .test.ts --fix",
 		"madge:circular": "node ./scripts/circular.js",
 		"madge:graph": "./node_modules/madge/bin/cli.js --image circular-graph.svg --extensions ts ./packages/**/source",
-		"pg:down": "docker compose -f docker/local/docker-compose.yml down",
+		"pg:down": "pnpm run container compose -f docker/local/docker-compose.yml down",
 		"pg:reset": "pnpm run pg:down -v && pnpm run pg:up",
-		"pg:up": "docker compose -f docker/local/docker-compose.yml up -d",
+		"pg:up": "pnpm run container compose -f docker/local/docker-compose.yml up -d",
 		"prettier": "prettier --write \"./*.{ts,js,json,md}\" \"./packages/**/*.{ts,js,json,md}\"",
 		"prettier:dry": "prettier --check \"./*.{ts,js,json,md}\" \"./packages/**/*.{ts,js,json,md}\"",
 		"references": "node ./scripts/references/update-references.js",
diff --git a/scripts/container-cli.sh b/scripts/container-cli.sh
new file mode 100755
index 0000000000..a3f27bb57b
--- /dev/null
+++ b/scripts/container-cli.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# To switch the container CLI to Podman instead of Docker, run:
+#     export CONTAINER_CLI=podman
+# To return to auto-detection mode (Docker or Podman), run:
+#     unset CONTAINER_CLI
+# By default, Docker will have priority over Podman if both are installed.
+
+if [ -z "$CONTAINER_CLI" ]; then
+    if command -v docker >/dev/null 2>&1; then
+        CONTAINER_CLI=docker
+    elif command -v podman >/dev/null 2>&1; then
+        CONTAINER_CLI=podman
+    else
+        echo "Error: Docker or podman not found."
+        exit 1
+    fi
+fi
+
+$CONTAINER_CLI "$@"
\ No newline at end of file