diff --git a/deployments/examples/ocis_keycloak/config/ocis/entrypoint-override.sh b/deployments/examples/ocis_keycloak/config/ocis/entrypoint-override.sh
index 9e0a524ac1..6aa00a723e 100644
--- a/deployments/examples/ocis_keycloak/config/ocis/entrypoint-override.sh
+++ b/deployments/examples/ocis_keycloak/config/ocis/entrypoint-override.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -evx
+set -e
 
 ocis server&
 sleep 10
@@ -18,8 +18,20 @@ REVA_USER_UUID=$(ocis accounts list | grep " | Reva Inter " | egrep '[0-9a-f]{8}
 echo "  Reva user UUID: $REVA_USER_UUID"
 ocis accounts update --password $STORAGE_LDAP_BIND_PASSWORD $REVA_USER_UUID
 
-killall ocis
 echo "default secrets changed"
 echo "##################################################"
 
-ocis server
+echo "##################################################"
+echo "delete demo users" # demo users are provided by keycloak
+
+set +e # accounts can only delete once, so it will fail the second time
+ocis accounts remove 4c510ada-c86b-4815-8820-42cdf82c3d51
+ocis accounts remove ddc2004c-0977-11eb-9d3f-a793888cd0f8
+ocis accounts remove 932b4540-8d16-481e-8ef4-588e4b6b151c
+ocis accounts remove 058bff95-6708-4fe5-91e4-9ea3d377588b
+ocis accounts remove f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c
+set -e
+
+echo "##################################################"
+
+wait # wait for oCIS to exit
diff --git a/deployments/examples/ocis_traefik/config/ocis/entrypoint-override.sh b/deployments/examples/ocis_traefik/config/ocis/entrypoint-override.sh
index 9e0a524ac1..c1f96fae4e 100644
--- a/deployments/examples/ocis_traefik/config/ocis/entrypoint-override.sh
+++ b/deployments/examples/ocis_traefik/config/ocis/entrypoint-override.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -evx
+set -e
 
 ocis server&
 sleep 10
@@ -18,8 +18,7 @@ REVA_USER_UUID=$(ocis accounts list | grep " | Reva Inter " | egrep '[0-9a-f]{8}
 echo "  Reva user UUID: $REVA_USER_UUID"
 ocis accounts update --password $STORAGE_LDAP_BIND_PASSWORD $REVA_USER_UUID
 
-killall ocis
 echo "default secrets changed"
 echo "##################################################"
 
-ocis server
+wait # wait for oCIS to exit