diff --git a/docker-compose.yml b/docker-compose.yml
index a7d79841b..22f57d329 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -73,6 +73,7 @@ services:
     image: 'bitnami/kafka:${KAFKA_IMAGE_VERSION:-3.5.1}'
     container_name: kafka
     restart: always
+    user: ${KAFKA_USER:-root}
     ports:
       - "${KAFKA_PORT:-19094}:9094"
     volumes:
diff --git a/scripts/init-config.sh b/scripts/init-config.sh
index 89ca4e78f..631bd68d7 100755
--- a/scripts/init-config.sh
+++ b/scripts/init-config.sh
@@ -168,7 +168,7 @@ while [[ $# -gt 0 ]]; do
 done
 
 # Generate configuration files if requested
-if [[ "${FORCE_OVERWRITE}" == true ]]; then
+if [[ "${FORCE_OVERWRITE}" == true || "${SKIP_EXISTING}" == false ]]; then
   generate_config_files
 fi