diff --git a/.github/workflows/demo-checkin-app.yml b/.github/workflows/demo-checkin-app.yml
index d49b161f..2b7b5b71 100644
--- a/.github/workflows/demo-checkin-app.yml
+++ b/.github/workflows/demo-checkin-app.yml
@@ -1,6 +1,7 @@
 # https://docs.spring.io/spring-boot/docs/current/maven-plugin/reference/htmlsingle/#build-image
 
-name: Build and package image for iris-app-api-demo and deploy it to docker.io
+# Build and package image for demo-checkin-app and deploy it to docker.io
+name: demo-checkin-app Develop
 
 on:
   push:
diff --git a/README.adoc b/README.adoc
index a84b836e..e75cdba5 100644
--- a/README.adoc
+++ b/README.adoc
@@ -51,11 +51,11 @@ $ ./mvnw spring-boot:run -PlocalDev -am -pl iris-location-service <4>
 
 # in a third console
 $ cd iris <2>
-$ ./mvnw spring-boot:run -PlocalDev -am -pl iris-app-api-demo <5>
+$ ./mvnw spring-boot:run -PlocalDev -am -pl demo-checkin-app <5>
 
 # in a fourth console
 $ cd iris <2>
-$ ./mvnw spring-boot:run -PlocalDev -am -pl iris-api-generator,iris-client-sormas-sidecar <6>
+$ ./mvnw spring-boot:run -PlocalDev -am -pl iris-api-generator,iris-client-bff <6>
 ----
 <1> Clone the repository.
 <2> Switch to the root directory.
@@ -89,9 +89,9 @@ fi
 
 $tab"cd IRIS/iris-public-server && mvn clean && ./mvnw spring-boot:run -PlocalDev -am$end"
 $tab"cd IRIS/iris-location-service && mvn clean && sleep 5 && ./mvnw spring-boot:run -PlocalDev -am$end"
-$tab"cd IRIS && sleep 10 && ./mvnw spring-boot:run -PlocalDev -am -pl iris-app-api-demo$end"
+$tab"cd IRIS && sleep 10 && ./mvnw spring-boot:run -PlocalDev -am -pl demo-checkin-app$end"
 
-$tab"cd IRIS && sleep 15 && ./mvnw spring-boot:run -PlocalDev -am -pl iris-client-sormas-sidecar$end"
+$tab"cd IRIS && sleep 15 && ./mvnw spring-boot:run -PlocalDev -am -pl iris-client-bff$end"
 if [[ $* == *--fe* ]]
 then
   $tab"cd iris-client-frontend && sleep 15 && npm run serve$end"
diff --git a/demo-checkin-app/src/main/resources/application.properties b/demo-checkin-app/src/main/resources/application.properties
index 91a2c6ab..38163c35 100644
--- a/demo-checkin-app/src/main/resources/application.properties
+++ b/demo-checkin-app/src/main/resources/application.properties
@@ -5,7 +5,7 @@ server.port=8091
 server.ssl.key-store-type=PKCS12
 server.ssl.key-store=classpath:keystore.p12
 server.ssl.key-store-password=irisapp
-server.ssl.key-alias=iris-app-api-demo
+server.ssl.key-alias=demo-checkin-app
 
 logging.level.org.apache.http=INFO
 spring.output.ansi.enabled=ALWAYS
diff --git a/demo-checkin-app/src/main/resources/keystore.p12 b/demo-checkin-app/src/main/resources/keystore.p12
index 8c7d6127..7fd243e8 100644
Binary files a/demo-checkin-app/src/main/resources/keystore.p12 and b/demo-checkin-app/src/main/resources/keystore.p12 differ
diff --git a/infrastructure/docker-compose-all.staging.yml b/infrastructure/docker-compose-all.staging.yml
index b13ae76b..5b15d958 100644
--- a/infrastructure/docker-compose-all.staging.yml
+++ b/infrastructure/docker-compose-all.staging.yml
@@ -85,8 +85,8 @@ services:
       iris-client:
         condition: service_started
 
-  iris-app-api-demo:
-    image: inoeg/iris-app-api-demo:${IRIS_VERSION}
+  demo-checkin-app:
+    image: inoeg/demo-checkin-app:${IRIS_VERSION}
     depends_on:
       iris-location:
         condition: service_started
diff --git a/infrastructure/docker-compose-all.yml b/infrastructure/docker-compose-all.yml
index af216fd3..30f3d0d0 100644
--- a/infrastructure/docker-compose-all.yml
+++ b/infrastructure/docker-compose-all.yml
@@ -69,8 +69,8 @@ services:
     depends_on:
       - iris-client
 
-  iris-app-api-demo:
-    image: inoeg/iris-app-api-demo:${IRIS_VERSION}
+  demo-checkin-app:
+    image: inoeg/demo-checkin-app:${IRIS_VERSION}
     depends_on:
       iris-location:
         condition: service_started
diff --git a/infrastructure/docker-compose.staging.yml b/infrastructure/docker-compose.staging.yml
index 19f3a2f5..b88a1fef 100644
--- a/infrastructure/docker-compose.staging.yml
+++ b/infrastructure/docker-compose.staging.yml
@@ -71,8 +71,8 @@ services:
       iris-client:
         condition: service_started
 
-  iris-app-api-demo:
-    image: inoeg/iris-app-api-demo:${IRIS_VERSION}
+  demo-checkin-app:
+    image: inoeg/demo-checkin-app:${IRIS_VERSION}
     depends_on:
       iris-location:
         condition: service_started
diff --git a/infrastructure/docker-compose.yml b/infrastructure/docker-compose.yml
index 7dff8712..76813ff8 100644
--- a/infrastructure/docker-compose.yml
+++ b/infrastructure/docker-compose.yml
@@ -56,8 +56,8 @@ services:
     depends_on:
       - iris-client
 
-  iris-app-api-demo:
-    image: inoeg/iris-app-api-demo:${IRIS_VERSION}
+  demo-checkin-app:
+    image: inoeg/demo-checkin-app:${IRIS_VERSION}
     depends_on:
       iris-location:
         condition: service_started
diff --git a/iris-public-server/src/main/resources/application-docker.properties b/iris-public-server/src/main/resources/application-docker.properties
index 289c1899..ac0e74a7 100644
--- a/iris-public-server/src/main/resources/application-docker.properties
+++ b/iris-public-server/src/main/resources/application-docker.properties
@@ -22,7 +22,7 @@ springdoc.api-docs.enabled=true
 logging.level.iris=DEBUG
 
 providers.providers.[0].id=f002f370-bd54-4325-ad91-1aff3bf730a5
-providers.providers.[0].data-request-endpoint=https://iris-app-api-demo:8091/api/iris/data-request
+providers.providers.[0].data-request-endpoint=https://demo-checkin-app:8091/api/iris/data-request
 
 providers.providers.[1].id=bcf054fd-c904-484a-acdb-798e151c5142
 providers.providers.[1].data-request-endpoint=https://staging.iris.smartmeeting.online/api/services/iris/v1/data-request