diff --git a/audit.properties b/audit.properties
index 2f1294b838db7fcc231c9fe329954253cd24becb..e058b3a857f70065ba93b0690aeffff933b867b6 100644
--- a/audit.properties
+++ b/audit.properties
@@ -17,9 +17,9 @@ keycloak.security-constraints[0].securityCollections[0].patterns[0]=${ACT_KEYCLO
 keycloak.principal-attribute=${ACT_KEYCLOAK_PRINCIPAL_ATTRIBUTE:preferred-username}
 # see https://issues.jboss.org/browse/KEYCLOAK-810 for configuration options
 
-keycloakadminclientapp=${ACT_KEYCLOAK_CLIENT_APP:admin-cli}
-keycloakclientuser=${ACT_KEYCLOAK_CLIENT_USER:client}
-keycloakclientpassword=${ACT_KEYCLOAK_CLIENT_PASSWORD:client}
+activiti.keycloak.admin-client-app=${ACT_KEYCLOAK_CLIENT_APP:admin-cli}
+activiti.keycloak.client-user=${ACT_KEYCLOAK_CLIENT_USER:client}
+activiti.keycloak.client-password=${ACT_KEYCLOAK_CLIENT_PASSWORD:client}
 # this user needs to have the realm management roles assigned
 
 spring.rabbitmq.host=${ACT_RABBITMQ_HOST:rabbitmq}
diff --git a/query.properties b/query.properties
index 645e6365da74a6f7c3d28b5f8808fec6188f7414..1b9eb64313d862e43d573d2cf70d5ef37ac5625b 100644
--- a/query.properties
+++ b/query.properties
@@ -20,9 +20,9 @@ keycloak.security-constraints[0].securityCollections[0].patterns[0]=${ACT_KEYCLO
 keycloak.principal-attribute=${ACT_KEYCLOAK_PRINCIPAL_ATTRIBUTE:preferred-username}
 # see https://issues.jboss.org/browse/KEYCLOAK-810 for configuration options
 
-keycloakadminclientapp=${ACT_KEYCLOAK_CLIENT_APP:admin-cli}
-keycloakclientuser=${ACT_KEYCLOAK_CLIENT_USER:client}
-keycloakclientpassword=${ACT_KEYCLOAK_CLIENT_PASSWORD:client}
+activiti.keycloak.admin-client-app=${ACT_KEYCLOAK_CLIENT_APP:admin-cli}
+activiti.keycloak.client-user=${ACT_KEYCLOAK_CLIENT_USER:client}
+activiti.keycloak.client-password=${ACT_KEYCLOAK_CLIENT_PASSWORD:client}
 # this user needs to have the realm management roles assigned
 
 spring.rabbitmq.host=${ACT_RABBITMQ_HOST:rabbitmq}
diff --git a/runtime-bundle1.properties b/rb-my-app.properties
similarity index 92%
rename from runtime-bundle1.properties
rename to rb-my-app.properties
index ce5fd37abd506231f39b41607ca93c8a2d9b6a81..60836a7cb7a80a6174d903a37362358489242a88 100644
--- a/runtime-bundle1.properties
+++ b/rb-my-app.properties
@@ -21,9 +21,9 @@ keycloak.security-constraints[0].securityCollections[0].patterns[0]=${ACT_KEYCLO
 keycloak.principal-attribute=${ACT_KEYCLOAK_PRINCIPAL_ATTRIBUTE:preferred-username}
 # see https://issues.jboss.org/browse/KEYCLOAK-810 for configuration options
 
-keycloakadminclientapp=${ACT_KEYCLOAK_CLIENT_APP:admin-cli}
-keycloakclientuser=${ACT_KEYCLOAK_CLIENT_USER:client}
-keycloakclientpassword=${ACT_KEYCLOAK_CLIENT_PASSWORD:client}
+activiti.keycloak.admin-client-app=${ACT_KEYCLOAK_CLIENT_APP:admin-cli}
+activiti.keycloak.client-user=${ACT_KEYCLOAK_CLIENT_USER:client}
+activiti.keycloak.client-password=${ACT_KEYCLOAK_CLIENT_PASSWORD:client}
 # this user needs to have the realm management roles assigned
 
 #change this for prod envs