diff --git a/.gitlab/scripts/update-opentofu-versions.sh b/.gitlab/scripts/update-opentofu-versions.sh
index f1212285bada65012512a919cd1025d75ae9734f..0337135d256d7acb0c674420ae7f325cb71f1830 100755
--- a/.gitlab/scripts/update-opentofu-versions.sh
+++ b/.gitlab/scripts/update-opentofu-versions.sh
@@ -7,8 +7,11 @@ project_dir="$script_dir/../.."
 
 echo "Updating template files ..."
 
-templates="templates/apply.yml templates/custom-command.yml templates/destroy.yml templates/fmt.yml templates/full-pipeline.yml templates/job-templates.yml templates/plan.yml templates/test.yml templates/validate-plan-apply.yml templates/validate-plan-destroy.yml templates/validate-plan.yml templates/validate.yml"
+templates="templates/*.yml"
+templates_exclude="templates/delete-state.yml templates/module-release.yml"
+
 for relative_template_file in $templates; do
+  if echo "$templates_exclude" | grep -q "$relative_template_file"; then continue; fi
   template_file="$project_dir/$relative_template_file"
   tmp_template_file1=$(mktemp)
   tmp_template_file2=$(mktemp)
diff --git a/templates/graph.yml b/templates/graph.yml
index b314c0740d6f16e5548165cd5fc1344f3277d412..85afeba47c1797020c477bfddbf3cdafff203eab 100644
--- a/templates/graph.yml
+++ b/templates/graph.yml
@@ -18,13 +18,13 @@ spec:
     opentofu_version:
       default: '1.7.1'
       options:
-        - '$OPENTOFU_VERSION'
         - '1.7.1'
         - '1.7.0'
         - '1.7.0-alpha1'
         - '1.6.2'
         - '1.6.1'
         - '1.6.0'
+        - '$OPENTOFU_VERSION'
       description: 'OpenTofu version that should be used.'
 
     # Images