diff --git a/actions/release-migrations/v11-01-yaml-hosts.sh b/actions/release-migrations/v11-01-yaml-hosts.sh
index d25ce91113459b62f83a154dc6183375532940f4..2fe7081a2c2a2ba4ffb2a13cf6dbd7bfa72e5504 100755
--- a/actions/release-migrations/v11-01-yaml-hosts.sh
+++ b/actions/release-migrations/v11-01-yaml-hosts.sh
@@ -6,10 +6,13 @@ actions_dir="$(dirname "$0")/.."
 # shellcheck source=actions/lib.sh
 . "$actions_dir/lib.sh"
 
-if [ "${tf_usage:-true}" == 'true' ]; then
+load_conf_vars
+
+if [ "${tf_usage:?}" == 'true' ]; then
     notef "Removing obsolete state files..."
-    run git rm -rf "$terraform_state_dir/rendered"
+    run git rm --ignore-unmatch --force -r "$terraform_state_dir/rendered"
 
     notef "Running Terraform stage to create output files"
     run "$actions_dir/apply-terraform.sh"
+    run git add "$state_dir/terraform"
 fi
diff --git a/docs/_releasenotes/hotfix/2209.fix.1.migration-idempotent b/docs/_releasenotes/hotfix/2209.fix.1.migration-idempotent
new file mode 100644
index 0000000000000000000000000000000000000000..b7a694d7262196e6dfc4e344a0943cef9976c299
--- /dev/null
+++ b/docs/_releasenotes/hotfix/2209.fix.1.migration-idempotent
@@ -0,0 +1 @@
+Fixed a bug which prevented to rerun the release migration script :ref:`migrate-to-release.sh<actions-references.migrate-to-releasesh>`.
diff --git a/docs/_releasenotes/hotfix/2209.fix.2.missing-config-read-added-in-release-migration b/docs/_releasenotes/hotfix/2209.fix.2.missing-config-read-added-in-release-migration
new file mode 100644
index 0000000000000000000000000000000000000000..6bb753b9de248e8046d56bfa11a65f6ec3357bb0
--- /dev/null
+++ b/docs/_releasenotes/hotfix/2209.fix.2.missing-config-read-added-in-release-migration
@@ -0,0 +1,2 @@
+Fixed a bug which prevented the release migration script :ref:`migrate-to-release.sh<actions-references.migrate-to-releasesh>`
+from completing successfully with :ref:`Terraform disabled <configuration-options.yk8s.terraform.enabled>`.
diff --git a/docs/_releasenotes/hotfix/2209.fix.3.new-terraform-state-captured-in-release-migration b/docs/_releasenotes/hotfix/2209.fix.3.new-terraform-state-captured-in-release-migration
new file mode 100644
index 0000000000000000000000000000000000000000..3169ee8e0c4a8644577175cd23b55e5667c1113b
--- /dev/null
+++ b/docs/_releasenotes/hotfix/2209.fix.3.new-terraform-state-captured-in-release-migration
@@ -0,0 +1 @@
+Fixed a bug in the release migration that left new Terraform state uncommitted.
diff --git a/version b/version
index a1ea332d2835ac2a6b96f97dfedc59309f1459a0..e7e9473ae39a36eeee6d131094c5dbd8e35718db 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-11.0.2
+11.0.3