diff --git a/app.ts b/app.ts
index 498240f3..ab920927 100644
--- a/app.ts
+++ b/app.ts
@@ -6,7 +6,7 @@ import { connect as mongoConnect } from './db_connect'
 const { resubscribeInvoices } = require('./ln');
 import { logger } from "./logger";
 import { Telegraf } from "telegraf";
-const { delay } = require('./util');
+import { delay } from './util';
 
 (async () => {
   process.on('unhandledRejection', e => {
diff --git a/bot/start.ts b/bot/start.ts
index 77b28ac1..7fddccfd 100644
--- a/bot/start.ts
+++ b/bot/start.ts
@@ -13,7 +13,7 @@ import {
   Dispute,
   Config,
 } from '../models';
-const { getCurrenciesWithPrice, deleteOrderFromChannel } = require('../util');
+import { getCurrenciesWithPrice, deleteOrderFromChannel } from '../util';
 const {
   commandArgsMiddleware,
   stageMiddleware,
diff --git a/bot/validations.ts b/bot/validations.ts
index 408acce2..e10f8be2 100644
--- a/bot/validations.ts
+++ b/bot/validations.ts
@@ -9,8 +9,8 @@ const { parsePaymentRequest } = require('invoices');
 const { ObjectId } = require('mongoose').Types;
 import * as messages from './messages';
 import { Order, User, Community } from '../models';
-const { isIso4217, isDisputeSolver } = require('../util');
-const { existLightningAddress } = require('../lnurl/lnurl-pay');
+import { isIso4217, isDisputeSolver } from '../util';
+import { existLightningAddress } from '../lnurl/lnurl-pay';
 import { logger } from '../logger';
 
 // We look in database if the telegram user exists,
diff --git a/jobs/pending_payments.ts b/jobs/pending_payments.ts
index aaa750be..9691e9f2 100644
--- a/jobs/pending_payments.ts
+++ b/jobs/pending_payments.ts
@@ -5,7 +5,7 @@ import { Telegraf } from 'telegraf';
 import { I18nContext } from '@grammyjs/i18n';
 import { MainContext } from '../bot/start';
 const { payRequest, isPendingPayment } = require('../ln');
-const { getUserI18nContext } = require('../util');
+import { getUserI18nContext } from '../util';
 
 export const attemptPendingPayments = async (bot: Telegraf<MainContext>): Promise<void> => {
   const pendingPayments = await PendingPayment.find({
diff --git a/ln/subscribe_invoice.ts b/ln/subscribe_invoice.ts
index 30420b67..4f1d1ccf 100644
--- a/ln/subscribe_invoice.ts
+++ b/ln/subscribe_invoice.ts
@@ -6,7 +6,7 @@ const { payToBuyer } = require('./pay_request');
 import { lnd } from "./connect";
 import * as messages from '../bot/messages';
 const ordersActions = require('../bot/ordersActions');
-const { getUserI18nContext, getEmojiRate, decimalRound } = require('../util');
+import { getUserI18nContext, getEmojiRate, decimalRound } from '../util';
 import { logger } from '../logger';
 
 const subscribeInvoice = async (bot: Telegraf<MainContext>, id: string, resub: boolean) => {