diff --git a/ee/app/assets/javascripts/geo_node_form/components/geo_node_form_capacities.vue b/ee/app/assets/javascripts/geo_node_form/components/geo_node_form_capacities.vue
index 9111b0c9dbb7147f22b9b051f6fdf9d352b41a2e..32313074b362f3153ef784047268f9863cfa16e3 100644
--- a/ee/app/assets/javascripts/geo_node_form/components/geo_node_form_capacities.vue
+++ b/ee/app/assets/javascripts/geo_node_form/components/geo_node_form_capacities.vue
@@ -111,7 +111,7 @@ export default {
         :class="{ 'is-invalid': Boolean(formErrors[formGroup.key]) }"
         class="col-sm-3"
         type="number"
-        @input="checkCapacity(formGroup)"
+        @update="checkCapacity(formGroup)"
       />
     </gl-form-group>
   </div>
diff --git a/ee/app/assets/javascripts/geo_node_form/components/geo_node_form_core.vue b/ee/app/assets/javascripts/geo_node_form/components/geo_node_form_core.vue
index 1aed3fd860f640c13411329774ca3ca67d8e15c5..9680ff90f6592a741953670cdfdb7fe56978922f 100644
--- a/ee/app/assets/javascripts/geo_node_form/components/geo_node_form_core.vue
+++ b/ee/app/assets/javascripts/geo_node_form/components/geo_node_form_core.vue
@@ -69,7 +69,7 @@ export default {
           :class="{ 'is-invalid': Boolean(formErrors.name) }"
           data-qa-selector="node_name_field"
           type="text"
-          @input="checkName"
+          @update="checkName"
         />
         <span class="gl-text-gray-700 m-n5 gl-z-index-2">{{ 255 - nodeData.name.length }}</span>
       </div>
@@ -106,7 +106,7 @@ export default {
             :class="{ 'is-invalid': Boolean(formErrors.url) }"
             data-qa-selector="node_url_field"
             type="text"
-            @input="checkUrl"
+            @update="checkUrl"
           />
           <span class="gl-text-gray-700 m-n5 gl-z-index-2">{{ 255 - nodeData.url.length }}</span>
         </div>
diff --git a/ee/app/assets/javascripts/geo_settings/components/geo_settings_form.vue b/ee/app/assets/javascripts/geo_settings/components/geo_settings_form.vue
index 5d12d3454b99fff59ca7e96264b95da789362c23..fe1e7f7590d806144b1d4b6d10890358ec212cba 100644
--- a/ee/app/assets/javascripts/geo_settings/components/geo_settings_form.vue
+++ b/ee/app/assets/javascripts/geo_settings/components/geo_settings_form.vue
@@ -56,6 +56,7 @@ export default {
         v-model="timeout"
         class="col-sm-2"
         type="number"
+        number
         :class="{ 'is-invalid': Boolean(formErrors.timeout) }"
         @blur="checkTimeout"
       />
diff --git a/ee/spec/frontend/geo_settings/components/geo_settings_form_spec.js b/ee/spec/frontend/geo_settings/components/geo_settings_form_spec.js
index 7ca5e69df5d2b6bae0d68def9b5f753a4d5e0896..074a77c150947d27ff13355d388b96c675e9e341 100644
--- a/ee/spec/frontend/geo_settings/components/geo_settings_form_spec.js
+++ b/ee/spec/frontend/geo_settings/components/geo_settings_form_spec.js
@@ -107,7 +107,7 @@ describe('GeoSettingsForm', () => {
       beforeEach(() => {
         createStore();
         createComponent();
-        findGeoSettingsTimeoutField().vm.$emit('input', data);
+        findGeoSettingsTimeoutField().setValue(data);
         findGeoSettingsTimeoutField().trigger('blur');
       });
 
@@ -134,7 +134,7 @@ describe('GeoSettingsForm', () => {
       beforeEach(() => {
         createStore();
         createComponent();
-        findGeoSettingsAllowedIpField().vm.$emit('input', data);
+        findGeoSettingsAllowedIpField().setValue(data);
         findGeoSettingsAllowedIpField().trigger('blur');
       });
 
diff --git a/package.json b/package.json
index 01da8fe7c51fe4e531b49ea427d4349eae6c9e33..1bf5e229ccdc68b4dd589bc388cc7b9ca6ac3cea 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@babel/preset-env": "^7.10.1",
     "@gitlab/at.js": "1.5.5",
     "@gitlab/svgs": "1.158.0",
-    "@gitlab/ui": "18.6.2",
+    "@gitlab/ui": "18.7.0",
     "@gitlab/visual-review-tools": "1.6.1",
     "@rails/actioncable": "^6.0.3-1",
     "@sentry/browser": "^5.10.2",
diff --git a/yarn.lock b/yarn.lock
index 4552b82c9d5e6cc72e06892e9d67eed4653479b1..506fd57dc647b457122397f381c4e1e8e52de48c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -848,10 +848,10 @@
   resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.158.0.tgz#300d416184a2b0e05f15a96547f726e1825b08a1"
   integrity sha512-5OJl+7TsXN9PJhY6/uwi+mTwmDZa9n/6119rf77orQ/joFYUypaYhBmy/1TcKVPsy5Zs6KCxE1kmGsfoXc1TYA==
 
-"@gitlab/ui@18.6.2":
-  version "18.6.2"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-18.6.2.tgz#92d18dd36482ae412500820835e9d62f30f108d4"
-  integrity sha512-3g22Q9RM1rmexipsZdroETJXd20+Fam1CHsC1h8vOWV4Fad5u3lgQp3KIQQlbmROIGTJ4PbiwE1Qldg+XAMsUw==
+"@gitlab/ui@18.7.0":
+  version "18.7.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-18.7.0.tgz#aee0054d50e50aaf9e7c4ea4b9e36ca4b97102bf"
+  integrity sha512-y1Gix1aCHvVO+zh6TCDmsCr97nLLHFnfEZRtg69EBnLBCLgwBcucC3mNeR4Q2EHTWjy/5U035UkyW6LDRX05mA==
   dependencies:
     "@babel/standalone" "^7.0.0"
     "@gitlab/vue-toasted" "^1.3.0"