diff --git a/Makefile b/Makefile
index 76369ddf..66a85870 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 ROLES_DIR         	:= ./roles
 APPLICATIONS_OUT  	:= ./group_vars/all/04_applications.yml
-APPLICATIONS_SCRIPT := ./cli/generate-applications-defaults.py
+APPLICATIONS_SCRIPT := ./cli/generate_applications.py
 USERS_OUT  			:= ./group_vars/all/03_users.yml
 USERS_SCRIPT		:= ./cli/generate_users.py
 INCLUDES_OUT      	:= ./tasks/utils/docker-roles.yml
@@ -9,6 +9,7 @@ INCLUDES_SCRIPT   	:= ./cli/generate_playbook.py
 EXTRA_USERS := $(shell \
 	find $(ROLES_DIR) -maxdepth 1 -type d -name 'docker*' -printf '%f\n' \
 	| sed -E 's/^docker[_-]?//' \
+	| grep -E -x '[a-z0-9]+' \
 	| paste -sd, - \
 )
 
diff --git a/cli/generate-applications-defaults.py b/cli/generate_applications.py
similarity index 100%
rename from cli/generate-applications-defaults.py
rename to cli/generate_applications.py
diff --git a/roles/user/meta/users.yml b/roles/user/meta/users.yml
index 84d371a4..38124490 100644
--- a/roles/user/meta/users.yml
+++ b/roles/user/meta/users.yml
@@ -44,9 +44,6 @@ users:
   proxy:
     username: proxy
     description: "Proxy user"
-  www-data:
-    username: www-data
-    description: "Web server user"
   backup:
     username: backup
     description: "Backup operator"
diff --git a/tests/unit/test_generate_applications_defaults_users.py b/tests/unit/test_generate_applications_defaults_users.py
index b05a3f68..47beec6d 100644
--- a/tests/unit/test_generate_applications_defaults_users.py
+++ b/tests/unit/test_generate_applications_defaults_users.py
@@ -43,7 +43,7 @@ class TestGenerateDefaultApplicationsUsers(unittest.TestCase):
         When a users.yml exists with defined users, the script should inject a 'users'
         mapping in the generated YAML, mapping each username to a Jinja2 reference.
         """
-        script_path = Path(__file__).resolve().parents[2] / "cli" / "generate-applications-defaults.py"
+        script_path = Path(__file__).resolve().parents[2] / "cli" / "generate_applications.py"
         result = subprocess.run([
             "python3", str(script_path),
             "--roles-dir", str(self.roles_dir),
diff --git a/tests/unit/test_generate_default_applications.py b/tests/unit/test_generate_default_applications.py
index 9b5cce3d..fe511778 100644
--- a/tests/unit/test_generate_default_applications.py
+++ b/tests/unit/test_generate_default_applications.py
@@ -29,7 +29,7 @@ class TestGenerateDefaultApplications(unittest.TestCase):
         shutil.rmtree(self.temp_dir)
 
     def test_script_generates_expected_yaml(self):
-        script_path = Path(__file__).resolve().parent.parent.parent / "cli" / "generate-applications-defaults.py"
+        script_path = Path(__file__).resolve().parent.parent.parent / "cli" / "generate_applications.py"
 
         result = subprocess.run(
             [