diff --git a/templates/apply.yml b/templates/apply.yml
index e2d37785e6a28c5aa3c51d7e1e64c37ed004d1b1..f57d7f9d440b4958eccaacf6cc2ecc9b05b1a09d 100644
--- a/templates/apply.yml
+++ b/templates/apply.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
diff --git a/templates/custom-command.yml b/templates/custom-command.yml
index f1f9f903bf04c8bd90400138d35312ee4c7d8534..b38a20c882741c8c088808af20598dda1b1bb994 100644
--- a/templates/custom-command.yml
+++ b/templates/custom-command.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
diff --git a/templates/destroy.yml b/templates/destroy.yml
index cd9a743184f27352aac9d355f297f24645db7c47..748ef2829146c0997581380d628ea838db6dd159 100644
--- a/templates/destroy.yml
+++ b/templates/destroy.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
diff --git a/templates/fmt.yml b/templates/fmt.yml
index 57fa7b214440a4186ff35da58c290ec09394251f..cb8d1308d95eebc040b34effd5fbb0d030b3d176 100644
--- a/templates/fmt.yml
+++ b/templates/fmt.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
diff --git a/templates/full-pipeline.yml b/templates/full-pipeline.yml
index f0e4dd4afa7ae63549b65f206a31e5963a84a878..5654671803807be0a68c3142cbadce77968e3e42 100644
--- a/templates/full-pipeline.yml
+++ b/templates/full-pipeline.yml
@@ -27,13 +27,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
diff --git a/templates/job-templates.yml b/templates/job-templates.yml
index e6a0fe8ce97e4372c60d9db75ab1e235f563307b..31338dacc39255c4446a1561615be0ded551f101 100644
--- a/templates/job-templates.yml
+++ b/templates/job-templates.yml
@@ -27,13 +27,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
diff --git a/templates/plan.yml b/templates/plan.yml
index 08d0110eed6be150b7a36120788b6665ba4f4935..58255d5de71288ac1d457fff4fa3bb6312964c06 100644
--- a/templates/plan.yml
+++ b/templates/plan.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
@@ -97,11 +97,6 @@ spec:
   image:
     name: '$[[ inputs.image_registry_base ]]/$[[ inputs.image_name ]]:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]'
   script:
-    - |
-      args=""
-      if [ "$[[ inputs.destroy ]]" == "true" ]; then 
-        echo "Planning for a destroy"
-        args="-destroy"
-      fi
+    - "args=\"\"\nif [ \"$[[ inputs.destroy ]]\" == \"true\" ]; then \n  echo \"Planning for a destroy\"\n  args=\"-destroy\"\nfi\n"
     - gitlab-tofu plan $args
     - gitlab-tofu plan-json
diff --git a/templates/test.yml b/templates/test.yml
index 29767e4b2c2b61b1a6325ccb89e1114a849a18f1..8f651074a4ffe0618a809c5a653cf39cad1cb138 100644
--- a/templates/test.yml
+++ b/templates/test.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
diff --git a/templates/validate-plan-apply.yml b/templates/validate-plan-apply.yml
index 7608be908dd444e97e6c41eaafde10b72ffc6d16..258662b112d9850f5d27d9e1e1698c044f56ad3b 100644
--- a/templates/validate-plan-apply.yml
+++ b/templates/validate-plan-apply.yml
@@ -21,13 +21,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
diff --git a/templates/validate-plan-destroy.yml b/templates/validate-plan-destroy.yml
index 35c51a92ba7feb2f87e6738e8faaaf51095c6a6e..60f2fb6594431d7b7968b3f6a821b69ee138caec 100644
--- a/templates/validate-plan-destroy.yml
+++ b/templates/validate-plan-destroy.yml
@@ -21,13 +21,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
diff --git a/templates/validate-plan.yml b/templates/validate-plan.yml
index 145e858aaabc926bd87de2f6a020022037e856e7..480f0684e9203240301d8d749129096646bc2ee3 100644
--- a/templates/validate-plan.yml
+++ b/templates/validate-plan.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
diff --git a/templates/validate.yml b/templates/validate.yml
index 2b1b407e3efbe2c93072d677a0c4e67d6c9d281d..3be97a19b5f1cb90642eabe6a772bbe0f5b59a9c 100644
--- a/templates/validate.yml
+++ b/templates/validate.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