diff --git a/resources/assets/vue/components/admin-workflow/sections/QuestionAnswerSectionComponent.vue b/resources/assets/vue/components/admin-workflow/sections/QuestionAnswerSectionComponent.vue
index 5cd699e1..257ed2eb 100644
--- a/resources/assets/vue/components/admin-workflow/sections/QuestionAnswerSectionComponent.vue
+++ b/resources/assets/vue/components/admin-workflow/sections/QuestionAnswerSectionComponent.vue
@@ -14,7 +14,8 @@
                         <div class="col-md-4">
                             <validation-wrapper-component selectable :validator="$v.filterQuestionGroup">
                                 <label>Question Groups</label>
-                                <selectable-hard-coded-component section="questionGroupSelectable" :selectable-options="questionGroups" v-model="filterQuestionGroup"></selectable-hard-coded-component >
+                                <select-component :options="questionGroups" v-model="filterQuestionGroup"></select-component>
+                                <!-- <selectable-hard-coded-component section="questionGroupSelectable" :selectable-options="questionGroups" v-model="filterQuestionGroup"></selectable-hard-coded-component > -->
                             </validation-wrapper-component>
                         </div>
                         <div class="col-md-4">
diff --git a/resources/assets/vue/components/companies/sections/AddVoucherOptionsSectionComponent.vue b/resources/assets/vue/components/companies/sections/AddVoucherOptionsSectionComponent.vue
index 2bc21651..7a5ebdd8 100644
--- a/resources/assets/vue/components/companies/sections/AddVoucherOptionsSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/AddVoucherOptionsSectionComponent.vue
@@ -14,7 +14,7 @@
                                 <div class="col">
                                     <validation-wrapper-component selectable :validator="$v.voucherCode">
                                         <label>Voucher Options</label>
-                                        <selectable-hard-coded-component section="rewardisActiveOptions" :selectable-options="options" v-model="voucherCode"></selectable-hard-coded-component >
+                                        <select-component :options="options" v-model="voucherCode"></select-component>
                                     </validation-wrapper-component>
                                 </div>
                             </div>
diff --git a/resources/assets/vue/components/general/forms/SelectableHardCodedComponent.vue b/resources/assets/vue/components/general/forms/SelectableHardCodedComponent.vue
deleted file mode 100644
index 05a4e007..00000000
--- a/resources/assets/vue/components/general/forms/SelectableHardCodedComponent.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
-    <select-component :options="selectableOptions" :value="value" @input="(val) => {$emit('input', val)}"></select-component>
-</template>
-<script>
-    export default {
-        props: {
-            value: {
-                required: false
-            },
-            section: {
-                type: String,
-                required: true
-            },
-            selectableOptions: {
-                type: Array,
-                required: true,
-                default: () => []
-            }
-        }
-    }
-</script>
-
diff --git a/resources/assets/vue/components/settings/forms/AddMilestoneFormComponent.vue b/resources/assets/vue/components/settings/forms/AddMilestoneFormComponent.vue
index 461a447b..7a8c1bac 100644
--- a/resources/assets/vue/components/settings/forms/AddMilestoneFormComponent.vue
+++ b/resources/assets/vue/components/settings/forms/AddMilestoneFormComponent.vue
@@ -20,7 +20,7 @@
                             <input type="hidden" class="form-control" v-if="parameters.id" v-model="parameters.id">
                             <validation-wrapper-component selectable :validator="$v.parameters.name">
                                 <label>Name</label>
-                                <selectable-hard-coded-component section="milestoneNameOptions" :selectable-options="optionsMilestoneName" v-model="parameters.name"></selectable-hard-coded-component>
+                                <select-component :options="optionsMilestoneName"  v-model="parameters.name"></select-component>
                             </validation-wrapper-component>
                         </div>
                     </div>
diff --git a/resources/assets/vue/components/settings/forms/AddRewardFormComponent.vue b/resources/assets/vue/components/settings/forms/AddRewardFormComponent.vue
index b00be4b0..6d975d4f 100644
--- a/resources/assets/vue/components/settings/forms/AddRewardFormComponent.vue
+++ b/resources/assets/vue/components/settings/forms/AddRewardFormComponent.vue
@@ -36,7 +36,7 @@
                         <div class="col">
                             <validation-wrapper-component selectable :validator="$v.parameters.is_active">
                                 <label>Is Active</label>
-                                <selectable-hard-coded-component section="rewardisActiveOptions" :selectable-options="optionsIsActive" v-model="parameters.is_active"></selectable-hard-coded-component >
+                                <select-component :options="optionsIsActive"  v-model="parameters.is_active"></select-component>
                             </validation-wrapper-component>
                         </div>
                     </div>
@@ -44,7 +44,7 @@
                         <div class="col">
                             <validation-wrapper-component selectable :validator="$v.parameters.type">
                                 <label>Type</label>
-                                <selectable-hard-coded-component section="rewardTypeOptions" :selectable-options="optionsType" v-model="parameters.type"></selectable-hard-coded-component>
+                                <select-component :options="optionsType"  v-model="parameters.type"></select-component>
                             </validation-wrapper-component>
                         </div>
                     </div>