diff --git a/db/Template.go b/db/Template.go
index d4ca07d03..0bd96d342 100644
--- a/db/Template.go
+++ b/db/Template.go
@@ -1,7 +1,9 @@
 package db
 
 import (
+	"bytes"
 	"encoding/json"
+	"fmt"
 )
 
 type TemplateType string
@@ -59,11 +61,63 @@ func (t TemplateApp) IsTerraform() bool {
 type SurveyVarType string
 
 const (
-	SurveyVarStr  TemplateType = ""
-	SurveyVarInt  TemplateType = "int"
-	SurveyVarEnum TemplateType = "enum"
+	SurveyVarStr    SurveyVarType = "str"
+	SurveyVarInt    SurveyVarType = "int"
+	SurveyVarEnum   SurveyVarType = "enum"
+	SurveyVarSelect SurveyVarType = "select"
 )
 
+// SurveyVarDefaultValue supports both a single string or an array of strings in JSON.
+// It preserves whether the original JSON was an array so encoding will keep the
+// original shape when possible (single value -> string, multiple -> array).
+type SurveyVarDefaultValue struct {
+	Values           []string `json:"-"`
+	originalWasArray bool     `json:"-"`
+}
+
+func (d *SurveyVarDefaultValue) UnmarshalJSON(b []byte) error {
+	if len(bytes.TrimSpace(b)) == 0 || bytes.Equal(bytes.TrimSpace(b), []byte("null")) {
+		d.Values = nil
+		d.originalWasArray = false
+		return nil
+	}
+
+	// try string
+	var s string
+	if err := json.Unmarshal(b, &s); err == nil {
+		d.Values = []string{s}
+		d.originalWasArray = false
+		return nil
+	}
+
+	// try []string
+	var arr []string
+	if err := json.Unmarshal(b, &arr); err == nil {
+		d.Values = arr
+		d.originalWasArray = true
+		return nil
+	}
+
+	return fmt.Errorf("invalid default_value: must be string or []string")
+}
+
+func (d SurveyVarDefaultValue) MarshalJSON() ([]byte, error) {
+	if d.Values == nil {
+		return []byte("null"), nil
+	}
+	if len(d.Values) == 1 && !d.originalWasArray {
+		return json.Marshal(d.Values[0])
+	}
+	return json.Marshal(d.Values)
+}
+
+func (d SurveyVarDefaultValue) String() string {
+	if len(d.Values) == 0 {
+		return ""
+	}
+	return d.Values[0]
+}
+
 type AnsibleTemplateParams struct {
 	AllowDebug             bool     `json:"allow_debug"`
 	AllowOverrideInventory bool     `json:"allow_override_inventory"`
@@ -89,13 +143,13 @@ type SurveyVarEnumValue struct {
 }
 
 type SurveyVar struct {
-	Name         string               `json:"name" backup:"name"`
-	Title        string               `json:"title" backup:"title"`
-	Required     bool                 `json:"required,omitempty" backup:"required"`
-	Type         SurveyVarType        `json:"type,omitempty" backup:"type"`
-	Description  string               `json:"description,omitempty" backup:"description"`
-	Values       []SurveyVarEnumValue `json:"values,omitempty" backup:"values"`
-	DefaultValue string               `json:"default_value,omitempty" backup:"default_value"`
+	Name         string                 `json:"name" backup:"name"`
+	Title        string                 `json:"title" backup:"title"`
+	Required     bool                   `json:"required,omitempty" backup:"required"`
+	Type         SurveyVarType          `json:"type,omitempty" backup:"type"`
+	Description  string                 `json:"description,omitempty" backup:"description"`
+	Values       []SurveyVarEnumValue   `json:"values,omitempty" backup:"values"`
+	DefaultValue *SurveyVarDefaultValue `json:"default_value,omitempty" backup:"default_value"`
 }
 
 type TemplateFilter struct {
diff --git a/web/src/components/SurveyVars.vue b/web/src/components/SurveyVars.vue
index 55587f160..3ed14d6b2 100644
--- a/web/src/components/SurveyVars.vue
+++ b/web/src/components/SurveyVars.vue
@@ -48,7 +48,7 @@
             ></v-select>
 
             <v-data-table
-              v-if="editedVar.type === 'enum'"
+              v-if="editedVar.type === 'enum' || editedVar.type === 'select'"
               :items="editedValues"
               :items-per-page="-1"
               class="elevation-1 FieldTable"
@@ -93,20 +93,34 @@
             <div class="text-right mt-2">
               <v-btn
                 color="primary"
-                v-if="editedVar.type === 'enum'"
+                class="d-block"
+                v-if="editedVar.type === 'enum' || editedVar.type === 'select'"
                 @click="addEditedVarValue()"
               >Add Value</v-btn>
             </div>
 
             <v-select
-              v-if="editedVar.type === 'enum'"
+              v-if="editedVar.type === 'enum' || editedVar.type === 'select'"
               v-model="editedVar.default_value"
               :label="$t('default_value')"
               :items="editedValues"
               item-value="value"
               item-text="name"
               clearable
-            ></v-select>
+              :multiple="editedVar.type === 'select'"
+              :chips="editedVar.type === 'select'"
+            >
+              <template
+                v-slot:selection="{ item, index }"
+                v-if="editedVar.type === 'select'">
+                <v-chip
+                  small
+                  close
+                  @click:close="removeDefaultItem(index)"
+                  >{{ selectedItemLabel(item) }}
+                </v-chip>
+              </template>
+            </v-select>
 
             <v-text-field
               type="number"
@@ -206,6 +220,9 @@ export default {
       }, {
         id: 'enum',
         name: 'Enum',
+      }, {
+        id: 'select',
+        name: 'Select',
       }],
       formError: null,
     };
@@ -232,6 +249,20 @@ export default {
       this.editedValues.push(...(this.editedVar.values || []));
       this.editedVar.values = this.editedValues;
 
+      // normalize default_value for select vs enum
+      if (this.editedVar.type === 'select') {
+        if (this.editedVar.default_value == null) {
+          this.editedVar.default_value = [];
+        } else if (!Array.isArray(this.editedVar.default_value)) {
+          const dv = this.editedVar.default_value;
+          this.editedVar.default_value = dv === '' ? [] : [dv];
+        }
+      } else if (Array.isArray(this.editedVar.default_value)) {
+        this.editedVar.default_value = this.editedVar.default_value.length > 0
+          ? this.editedVar.default_value[0]
+          : '';
+      }
+
       this.editedVarIndex = index;
 
       if (this.$refs.form) {
@@ -248,7 +279,7 @@ export default {
         return;
       }
 
-      if (this.editedVar.type === 'enum') {
+      if (this.editedVar.type === 'enum' || this.editedVar.type === 'select') {
         if (this.editedValues.length === 0) {
           this.formError = 'Enumeration must have values.';
           return;
@@ -274,6 +305,18 @@ export default {
         this.editedVar.values = [];
       }
 
+      // normalize default_value before saving: select keeps array, others use string
+      if (this.editedVar.type === 'select') {
+        if (!Array.isArray(this.editedVar.default_value)) {
+          const dv = this.editedVar.default_value;
+          this.editedVar.default_value = dv == null || dv === '' ? [] : [dv];
+        }
+      } else if (Array.isArray(this.editedVar.default_value)) {
+        this.editedVar.default_value = this.editedVar.default_value.length > 0
+          ? this.editedVar.default_value[0]
+          : '';
+      }
+
       if (this.editedVarIndex != null) {
         this.modifiedVars[this.editedVarIndex] = this.editedVar;
       } else {
@@ -289,6 +332,39 @@ export default {
       this.modifiedVars.splice(index, 1);
       this.$emit('change', this.modifiedVars);
     },
+
+    // remove one selected default item (for multiple select)
+    removeDefaultItem(index) {
+      if (!this.editedVar || !Array.isArray(this.editedVar.default_value)) {
+        return;
+      }
+
+      if (index >= 0 && index < this.editedVar.default_value.length) {
+        this.editedVar.default_value.splice(index, 1);
+      }
+    },
+
+    // label shown in selection chips - item could be the value or an object
+    selectedItemLabel(item) {
+      if (!item) return '';
+      if (typeof item === 'object' && item.name) return item.name;
+      const found = this.editedValues.find((v) => v.value === item || v.name === item);
+      return (found && found.name) || String(item);
+    },
+
+    onTypeChange(newType) {
+      if (!this.editedVar) return;
+      if (newType === 'select') {
+        if (!Array.isArray(this.editedVar.default_value)) {
+          const dv = this.editedVar.default_value;
+          this.editedVar.default_value = dv == null || dv === '' ? [] : [dv];
+        }
+      } else if (Array.isArray(this.editedVar.default_value)) {
+        this.editedVar.default_value = this.editedVar.default_value.length > 0
+          ? this.editedVar.default_value[0]
+          : '';
+      }
+    },
   },
 };
 </script>
diff --git a/web/src/components/TaskForm.vue b/web/src/components/TaskForm.vue
index 452f24910..7ff41e8c1 100644
--- a/web/src/components/TaskForm.vue
+++ b/web/src/components/TaskForm.vue
@@ -80,7 +80,7 @@
 
       <v-select
         clearable
-        v-else-if="v.type === 'enum'"
+        v-else-if="v.type === 'enum' || v.type === 'select'"
         :label="v.title + (v.required ? ' *' : '')"
         :hint="v.description"
         v-model="editedEnvironment[v.name]"
@@ -93,7 +93,19 @@
         item-value="value"
         outlined
         dense
-      />
+        :multiple="v.type === 'select'"
+        :chips="v.type === 'select'"
+      >
+      <template v-if="v.type === 'select'" v-slot:selection="{ item, index }">
+        <v-chip
+          small
+          close
+          @click:close="deleteItem(v.name, index)"
+        >
+          {{ item.name }}
+        </v-chip>
+      </template>
+    </v-select>
 
       <v-text-field
         v-else
@@ -289,6 +301,12 @@ export default {
       this.item.arguments = JSON.stringify(args || []);
     },
 
+    deleteItem(name, index) {
+      if (Array.isArray(this.editedEnvironment?.[name])) {
+        this.editedEnvironment[name].splice(index, 1);
+      }
+    },
+
     getTaskMessage(task) {
       let buildTask = task;
 
diff --git a/web/src/components/TaskParamsForm.vue b/web/src/components/TaskParamsForm.vue
index 973645f53..09cee0b2d 100644
--- a/web/src/components/TaskParamsForm.vue
+++ b/web/src/components/TaskParamsForm.vue
@@ -1,112 +1,111 @@
 <template>
   <div>
-    <v-text-field
-        v-model="item.message"
-        :label="$t('messageOptional')"
-        outlined
-        dense
-    />
-
-    <div v-for="(v) in template.survey_vars || []" :key="v.name">
+    <v-text-field v-model="item.message" :label="$t('messageOptional')" outlined dense />
 
+    <div v-for="v in template.survey_vars || []" :key="v.name">
       <v-text-field
-          v-if="v.type === 'secret'"
-          :label="v.title"
-          :hint="v.description"
-          v-model="editedSecretEnvironment[v.name]"
-          :required="v.required"
-          type="password"
-          :rules="[
-            val => !v.required || !!val || v.title + $t('isRequired'),
-          ]"
-          outlined
-          dense
+        v-if="v.type === 'secret'"
+        :label="v.title"
+        :hint="v.description"
+        v-model="editedSecretEnvironment[v.name]"
+        :required="v.required"
+        type="password"
+        :rules="[(val) => !v.required || !!val || v.title + $t('isRequired')]"
+        outlined
+        dense
       />
 
       <v-select
-          clearable
-          v-else-if="v.type === 'enum'"
-          :label="v.title + (v.required ? ' *' : '')"
-          :hint="v.description"
-          v-model="editedEnvironment[v.name]"
-          :required="v.required"
-          :rules="[
-          val => !v.required || val != null || v.title + ' ' + $t('isRequired')
-        ]"
-          :items="v.values"
-          item-text="name"
-          item-value="value"
-          outlined
-          dense
-      />
+        clearable
+        v-else-if="v.type === 'enum' || v.type === 'select'"
+        :label="v.title + (v.required ? ' *' : '')"
+        :hint="v.description"
+        v-model="editedEnvironment[v.name]"
+        :required="v.required"
+        :rules="[(val) => !v.required || val != null || v.title + ' ' + $t('isRequired')]"
+        :items="v.values"
+        item-text="name"
+        item-value="value"
+        :multiple="v.type === 'select'"
+        :chips="v.type === 'select'"
+        outlined
+        dense
+      >
+        <template v-if="v.type === 'select'" v-slot:selection="{ item, index }">
+          <v-chip
+            small
+            close
+            @click:close="removeSelectedItem(v.name, index)"
+          >
+            {{ item.name }}
+          </v-chip>
+        </template>
+      </v-select>
 
       <v-text-field
-          v-else
-          :label="v.title + (v.required ? ' *' : '')"
-          :hint="v.description"
-          v-model="editedEnvironment[v.name]"
-          :required="v.required"
-          :rules="[
-          val => !v.required || !!val || v.title + ' ' + $t('isRequired'),
-          val => !val || v.type !== 'int' || /^\d+$/.test(val) ||
-          v.title + ' ' + $t('mustBeInteger'),
+        v-else
+        :label="v.title + (v.required ? ' *' : '')"
+        :hint="v.description"
+        v-model="editedEnvironment[v.name]"
+        :required="v.required"
+        :rules="[
+          (val) => !v.required || !!val || v.title + ' ' + $t('isRequired'),
+          (val) =>
+            !val || v.type !== 'int' || /^\d+$/.test(val) || v.title + ' ' + $t('mustBeInteger'),
         ]"
-          outlined
-          dense
+        outlined
+        dense
       />
     </div>
 
     <v-text-field
-        v-model="git_branch"
-        :label="fieldLabel('branch')"
-        outlined
-        dense
-        required
-        v-if="
-        needField('allow_override_branch')
-        && template.allow_override_branch_in_task"
+      v-model="git_branch"
+      :label="fieldLabel('branch')"
+      outlined
+      dense
+      required
+      v-if="needField('allow_override_branch') && template.allow_override_branch_in_task"
     />
 
     <v-autocomplete
-        v-model="inventory_id"
-        :label="fieldLabel('inventory')"
-        :items="inventory"
-        item-value="id"
-        item-text="name"
-        outlined
-        dense
-        required
-        v-if="inventory != null && needInventory"
+      v-model="inventory_id"
+      :label="fieldLabel('inventory')"
+      :items="inventory"
+      item-value="id"
+      item-text="name"
+      outlined
+      dense
+      required
+      v-if="inventory != null && needInventory"
     ></v-autocomplete>
 
     <v-skeleton-loader
-        v-else-if="needInventory"
-        type="card"
-        height="46"
-        style="margin-bottom: 16px; margin-top: 4px;"
+      v-else-if="needInventory"
+      type="card"
+      height="46"
+      style="margin-bottom: 16px; margin-top: 4px"
     ></v-skeleton-loader>
 
     <TaskParamsAnsibleForm
-        v-if="template.app === 'ansible'"
-        v-model="item.params"
-        :app="template.app"
-        :template-params="template.task_params || {}"
+      v-if="template.app === 'ansible'"
+      v-model="item.params"
+      :app="template.app"
+      :template-params="template.task_params || {}"
     />
 
     <TaskParamsTerraformForm
-        v-else-if="['terraform', 'tofu', 'terragrunt'].includes(template.app)"
-        v-model="item.params"
-        :app="template.app"
-        :template-params="template.task_params || {}"
+      v-else-if="['terraform', 'tofu', 'terragrunt'].includes(template.app)"
+      v-model="item.params"
+      :app="template.app"
+      :template-params="template.task_params || {}"
     />
 
     <ArgsPicker
-        v-if="template.allow_override_args_in_task"
-        :vars="args"
-        title="CLI args"
-        @change="setArgs"
+      v-if="template.allow_override_args_in_task"
+      :vars="args"
+      title="CLI args"
+      @change="setArgs"
     />
-
   </div>
 </template>
 <script>
@@ -236,7 +235,6 @@ export default {
   },
 
   methods: {
-
     setArgs(args) {
       this.item.arguments = JSON.stringify(args || []);
     },
@@ -254,6 +252,18 @@ export default {
 
       this.editedEnvironment = JSON.parse(v.environment || '{}');
       this.editedSecretEnvironment = JSON.parse(v.secret || '{}');
+
+      // Normalize select type variables to ensure they are arrays
+      if (this.template && this.template.survey_vars) {
+        this.template.survey_vars.forEach((surveyVar) => {
+          if (surveyVar.type === 'select' && this.editedEnvironment[surveyVar.name] !== undefined) {
+            const currentValue = this.editedEnvironment[surveyVar.name];
+            if (!Array.isArray(currentValue)) {
+              this.editedEnvironment[surveyVar.name] = currentValue == null || currentValue === '' ? [] : [currentValue];
+            }
+          }
+        });
+      }
     },
 
     isLoaded() {
@@ -277,22 +287,26 @@ export default {
     async afterLoadData() {
       this.refreshItem();
 
-      [
-        this.buildTasks,
-        this.inventory,
-      ] = await Promise.all([
-
-        this.template.type === 'deploy' ? (await axios({
-          keys: 'get',
-          url: `/api/project/${this.projectId}/templates/${this.template.build_template_id}/tasks?status=success&limit=20`,
-          responseType: 'json',
-        })).data.filter((task) => task.status === 'success') : [],
-
-        this.needInventory ? (await axios({
-          keys: 'get',
-          url: this.getInventoryUrl(),
-          responseType: 'json',
-        })).data : [],
+      [this.buildTasks, this.inventory] = await Promise.all([
+        this.template.type === 'deploy'
+          ? (
+            await axios({
+              keys: 'get',
+              url: `/api/project/${this.projectId}/templates/${this.template.build_template_id}/tasks?status=success&limit=20`,
+              responseType: 'json',
+            })
+          ).data.filter((task) => task.status === 'success')
+          : [],
+
+        this.needInventory
+          ? (
+            await axios({
+              keys: 'get',
+              url: this.getInventoryUrl(),
+              responseType: 'json',
+            })
+          ).data
+          : [],
       ]);
 
       ['tags', 'limit', 'skip_tags'].forEach((param) => {
@@ -303,15 +317,22 @@ export default {
 
       const defaultVars = (this.template.survey_vars || [])
         .filter((s) => s.default_value)
-        .reduce((res, curr) => ({
-          ...res,
-          [curr.name]: curr.default_value,
-        }), {});
-
-      this.editedEnvironment = {
-        ...defaultVars,
-        ...this.editedEnvironment,
-      };
+        .reduce(
+          (res, curr) => ({
+            ...res,
+            [curr.name]: curr.default_value,
+          }),
+          {},
+        );
+
+      this.editedEnvironment = { ...defaultVars, ...this.editedEnvironment };
+
+      // Ensure select type variables without values are initialized as empty arrays
+      (this.template.survey_vars || []).forEach((surveyVar) => {
+        if (surveyVar.type === 'select' && this.editedEnvironment[surveyVar.name] === undefined) {
+          this.editedEnvironment[surveyVar.name] = [];
+        }
+      });
     },
 
     getInventoryUrl() {
@@ -326,6 +347,17 @@ export default {
       }
       return res;
     },
+
+    removeSelectedItem(varName, index) {
+      const env = this.editedEnvironment;
+      if (!Object.prototype.hasOwnProperty.call(env, varName) || !Array.isArray(env[varName])) {
+        return;
+      }
+
+      if (index < env[varName].length) {
+        env[varName].splice(index, 1);
+      }
+    },
   },
 };
 </script>
diff --git a/web/src/lang/en.js b/web/src/lang/en.js
index 3ec2a724f..bdd7ae828 100644
--- a/web/src/lang/en.js
+++ b/web/src/lang/en.js
@@ -133,6 +133,7 @@ export default {
   key: '{expr}',
   surveyVariables: 'Survey Variables',
   addVariable: 'Add variable',
+  allowMultipleValues: 'Allow multiple values',
   vaultName: 'Vault ID (optional)',
   vaultNameDefault: 'Only one `default` (empty) name may exist',
   default_value: 'Default value',