diff --git a/addon/components/hover-tooltip.hbs b/addon/components/hover-tooltip.hbs
index 835b08d06..80caa1d27 100644
--- a/addon/components/hover-tooltip.hbs
+++ b/addon/components/hover-tooltip.hbs
@@ -1,8 +1,8 @@
-<Velcro @placement={{this.placement}} as |velcro|>
+<this.Velcro @placement={{this.placement}} as |velcro|>
   {{#let velcro.loop as |loop|}}
     {{yield (hash velcroHook=velcro.hook handleHover=(modifier this.hover)) to='hover' }}
     {{#if this.tooltipOpen}}
       {{yield loop to='tooltip'}}
     {{/if}}
   {{/let}}
-</Velcro>
\ No newline at end of file
+</this.Velcro>
\ No newline at end of file
diff --git a/addon/components/hover-tooltip.ts b/addon/components/hover-tooltip.ts
index 348b5d491..d8ff74b64 100644
--- a/addon/components/hover-tooltip.ts
+++ b/addon/components/hover-tooltip.ts
@@ -1,12 +1,14 @@
 import Component from '@glimmer/component';
 import { modifier } from 'ember-modifier';
 import { tracked } from '@glimmer/tracking';
+import { Velcro } from 'ember-velcro';
 
 interface Args {
   placement?: string;
 }
 
 export default class HoverTooltip extends Component<Args> {
+  Velcro = Velcro;
   hover = modifier(
     (element) => {
       element.addEventListener('mouseenter', this.showTooltip);
diff --git a/addon/components/variable-plugin/date/edit.hbs b/addon/components/variable-plugin/date/edit.hbs
index 249b6a9fb..6e720ff1c 100644
--- a/addon/components/variable-plugin/date/edit.hbs
+++ b/addon/components/variable-plugin/date/edit.hbs
@@ -21,7 +21,7 @@
                 @onChange={{this.changeIncludeTime}}
               />
               {{#if this.isCustom}}
-                <Velcro @placement="top" @offsetOptions={{hash mainAxis=10}} as |velcro|>
+                <this.Velcro @placement="top" @offsetOptions={{hash mainAxis=10}} as |velcro|>
                   <AuBadge
                     @size="small"
                     @icon="info-circle"
@@ -40,7 +40,7 @@
                       {{t 'date-plugin.card.info-custom-time'}}
                     </AuPill>
                   {{/if}}
-                </Velcro>
+                </this.Velcro>
               {{/if}}
             </AuFormRow>
           </VariablePlugin::Date::DateTimePicker>
@@ -67,7 +67,7 @@
                 @onChange={{this.setDateFormatFromKey}}
               />
             </AuFormRow>
-          {{/if}}  
+          {{/if}}
           {{#if (eq this.dateFormatType "custom")}}
             <AuFormRow @alignment="post">
               <AuButton @skin="secondary" @icon="info-circle"
diff --git a/addon/components/variable-plugin/date/edit.ts b/addon/components/variable-plugin/date/edit.ts
index 50cefc964..4510267da 100644
--- a/addon/components/variable-plugin/date/edit.ts
+++ b/addon/components/variable-plugin/date/edit.ts
@@ -22,6 +22,7 @@ import {
   formatContainsTime,
   validateDateFormat,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/date-helpers';
+import { Velcro } from 'ember-velcro';
 
 type Args = {
   controller: SayController;
@@ -29,6 +30,8 @@ type Args = {
 };
 const SECONDS_REGEX = new RegExp('[sStT]|p{2,}');
 export default class DateEditComponent extends Component<Args> {
+  Velcro = Velcro;
+
   @service
   declare intl: IntlService;
 
diff --git a/addon/components/variable-plugin/number/nodeview.hbs b/addon/components/variable-plugin/number/nodeview.hbs
index be6ce7524..51d0e6e83 100644
--- a/addon/components/variable-plugin/number/nodeview.hbs
+++ b/addon/components/variable-plugin/number/nodeview.hbs
@@ -1,4 +1,4 @@
-<Velcro
+<this.Velcro
   @placement='bottom-start'
   @offsetOptions={{hash mainAxis=3}} as |velcro|
 >
@@ -57,4 +57,4 @@
       </AuCard>
     </div>
   {{/if}}
-</Velcro>
\ No newline at end of file
+</this.Velcro>
\ No newline at end of file
diff --git a/addon/components/variable-plugin/number/nodeview.ts b/addon/components/variable-plugin/number/nodeview.ts
index fd118d501..480957475 100644
--- a/addon/components/variable-plugin/number/nodeview.ts
+++ b/addon/components/variable-plugin/number/nodeview.ts
@@ -12,6 +12,7 @@ import { localCopy } from 'tracked-toolbox';
 import { isBlank } from '@ember/utils';
 import { isNumber } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/strings';
 import { numberToWords } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/number-to-words';
+import { Velcro } from 'ember-velcro';
 
 type Args = {
   getPos: () => number | undefined;
@@ -24,6 +25,8 @@ type Args = {
 };
 
 export default class NumberNodeviewComponent extends Component<Args> {
+  Velcro = Velcro;
+
   @localCopy('args.node.attrs.value', '') declare inputNumber: string;
   @localCopy('args.node.attrs.writtenNumber', false)
   declare writtenNumber: boolean;