diff --git a/bookshop/db/init.js b/bookshop/db/init.js
index 0db736ca..f3cd83c4 100644
--- a/bookshop/db/init.js
+++ b/bookshop/db/init.js
@@ -4,7 +4,7 @@
  * currencies, if not obtained through @capire/common.
  */
 
-module.exports = async (db)=>{
+export default async (db)=>{
 
   const has_common = db.model.definitions['sap.common.Currencies'].elements.numcode
   if (has_common) return
diff --git a/bookshop/index.js b/bookshop/index.js
index 7bffbe36..36b8028f 100644
--- a/bookshop/index.js
+++ b/bookshop/index.js
@@ -1,2 +1,2 @@
-const { CatalogService } = require('./srv/cat-service')
-module.exports = { CatalogService }
+import { CatalogService } from './srv/cat-service.js'
+export { CatalogService }
diff --git a/bookshop/package.json b/bookshop/package.json
index f2fb4210..f134f616 100644
--- a/bookshop/package.json
+++ b/bookshop/package.json
@@ -2,6 +2,7 @@
   "name": "@capire/bookshop",
   "version": "1.0.0",
   "description": "A simple self-contained bookshop service.",
+  "type": "module",
   "files": [
     "app",
     "srv",
diff --git a/bookshop/srv/admin-service.js b/bookshop/srv/admin-service.js
index 0cdae4d8..dcb0d6f9 100644
--- a/bookshop/srv/admin-service.js
+++ b/bookshop/srv/admin-service.js
@@ -1,6 +1,6 @@
-const cds = require('@sap/cds')
+import cds from '@sap/cds'
 
-module.exports = cds.service.impl (function(){
+export default cds.service.impl (function(){
   this.before ('NEW','Authors', genid)
   this.before ('NEW','Books', genid)
 })
diff --git a/bookshop/srv/cat-service.js b/bookshop/srv/cat-service.js
index 9fa85cca..21c57a0d 100644
--- a/bookshop/srv/cat-service.js
+++ b/bookshop/srv/cat-service.js
@@ -1,6 +1,6 @@
-const cds = require('@sap/cds')
+import cds from '@sap/cds'
 
-class CatalogService extends cds.ApplicationService { init(){
+export class CatalogService extends cds.ApplicationService { init(){
 
   const { Books } = cds.entities ('sap.capire.bookshop')
 
@@ -24,5 +24,3 @@ class CatalogService extends cds.ApplicationService { init(){
 
   return super.init()
 }}
-
-module.exports = { CatalogService }
diff --git a/bookshop/srv/user-service.js b/bookshop/srv/user-service.js
index 61f95fd8..491dbb27 100644
--- a/bookshop/srv/user-service.js
+++ b/bookshop/srv/user-service.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds')
-module.exports = cds.service.impl((srv) => {
+import cds from '@sap/cds'
+export default cds.service.impl((srv) => {
   srv.on('READ', 'me', ({ tenant, user, locale }) => ({ id: user.id, locale, tenant }))
 })