diff --git a/bookshop/package.json b/bookshop/package.json
index 20294682..642e9028 100644
--- a/bookshop/package.json
+++ b/bookshop/package.json
@@ -11,7 +11,7 @@
     "genres": "cds serve test/genres.cds",
     "start": "cds run",
     "watch": "cds watch",
-    "to-openapi": "cds compile srv --to openapi -s CatalogService -o srv"
+    "to-openapi": "cds compile srv --to openapi -s CatalogService -o srv && mv srv/srv.openapi3.json srv/CatalogService.openapi3.json"
   },
   "cds": {
     "requires": {
diff --git a/bookshop/server.js b/bookshop/server.js
index 819982b7..e5efe23d 100644
--- a/bookshop/server.js
+++ b/bookshop/server.js
@@ -16,12 +16,13 @@ cds
       req.swaggerDoc = await toOpenApiDoc(service, host, docCache)
       next()
     }, swaggerUi.serve, swaggerUi.setup())
+    addLink(service, apiPath)
   })
   .on ('listening', ({server})=> { host = 'localhost:'+server.address().port })
 
 async function toOpenApiDoc(service, host, cache) {
   if (!cache[service.name]) {
-    const spec = await openApiFromFile(service)
+    const spec = await openApiFromFile(service, host)
     if (spec) {
       cache[service.name] = spec
     }
@@ -29,7 +30,7 @@ async function toOpenApiDoc(service, host, cache) {
       DEBUG && DEBUG ('Compiling Open API spec for', service.name)
       cache[service.name] = cds.compile.to.openapi (service.model, {
         service: service.name,
-        scheme: 'http', host, basePath: service.path
+        'openapi:url': service.path
       })
     }
   }
@@ -45,4 +46,12 @@ async function openApiFromFile(service) {
   }
 }
 
+function addLink(service, apiPath) {
+  const link = (entity) => {
+    if (entity)  return // don't want to provide link on entity level
+    return { href:apiPath, name:'Swagger UI', title:'Show in Swagger UI' }
+  }
+  service.$linkProviders ? service.$linkProviders.push(link) : service.$linkProviders = [link]
+}
+
 module.exports = cds.server