diff --git a/.github/workflows/todo.yml b/.github/workflows/todo.yml
new file mode 100644
index 0000000..8ceeaab
--- /dev/null
+++ b/.github/workflows/todo.yml
@@ -0,0 +1,15 @@
+name: "TODO to Issue"
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  todo:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3.3.0
+      - name: "TODO to Issue"
+        uses: "alstr/todo-to-issue-action@v4.9.1"
+        with:
+          CLOSE_ISSUES: false
\ No newline at end of file
diff --git a/docs/development.md b/docs/development.md
index 8e8d21b..e73e449 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -5,7 +5,7 @@
 In order to assist with developing `mariadb-alpine`, the following software is strongly recommended:
 
 - a [containerd][containerd] runtime such as [docker for desktop][docker] or [lima][lima-vm]
-- a docker-cli compatible client (@TODO more testing with [nerdctl][], [podman][podman])
+- a docker-cli compatible client (TODO more testing with [nerdctl][] and [podman][podman])
 - [bash][bash] 4.0 or newer
 - [bash_unit][bash_unit] - a bash testing framework
 - [shellcheck][shellcheck] to validate shell script
@@ -43,7 +43,7 @@ There are sanity checks in place to help you from making mistakes:
 3. Hit "Run workflow" and wait a few minutes. Should tests or building containers fail, no tags or containers will be published to Github or Docker.
 4. Should you run into issues, file a new issue in the repository and assign @jbergstroem.
 
-<!-- @TODO Create a release with gh-cli -->
+<!-- TODO Document how to a release with gh-cli -->
 
 [containerd]: https://containerd.io
 [docker]: https://docker.com
diff --git a/sh/build-image.sh b/sh/build-image.sh
index 3247871..d768249 100755
--- a/sh/build-image.sh
+++ b/sh/build-image.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 # shellcheck shell=bash
+set -euo pipefail
 
 IMAGE=${IMAGE:-jbergstroem/mariadb-alpine}
 SHORT_SHA=$(git rev-parse --short HEAD)
diff --git a/sh/generate-benchmark.sh b/sh/generate-benchmark.sh
index 3df24d2..48c420a 100755
--- a/sh/generate-benchmark.sh
+++ b/sh/generate-benchmark.sh
@@ -1,10 +1,12 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
-
 set -euo pipefail
 
 # Fetches latest version and compressed size from dockerhub
-# Should go into some kind of release engineering at some point
+# TODO Benchmark should be run as part of release engineering/automation
+# TODO Sort benchmark by container size
+# TODO Fetch latest tag instead of digest for containers in benchmark
+# TODO Add size factor compared to smallest container in benchmark
 
 declare -A images=(
   ["mysql"]="library/mysql"
diff --git a/sh/my_print_defaults.sh b/sh/my_print_defaults.sh
index 64e839b..526511b 100755
--- a/sh/my_print_defaults.sh
+++ b/sh/my_print_defaults.sh
@@ -2,7 +2,8 @@
 # shellcheck shell=dash
 set -euo pipefail
 
-# Stack overflow'ed - should rewrite in awk or even shell for readability
+# Stack overflow'ed
+# TODO Rewrite parsing config ini in awk or even shell for readability
 sed -n \
   '/^[ \t]*\[mariadb\]/,/\[/s/^[ \t]*\([^#; \t][^ \t=]*\).*=[ \t]*\(.*\)/--\1=\2/p' \
   /etc/my.cnf.d/* | sed 's:#.*$::g'