diff --git a/.github/workflows/template-cleanup.yml b/.github/workflows/template-cleanup.yml
index 17d6bb9..d0a2f76 100644
--- a/.github/workflows/template-cleanup.yml
+++ b/.github/workflows/template-cleanup.yml
@@ -29,9 +29,10 @@ jobs:
 
           # Prepare variables
           NAME="${GITHUB_REPOSITORY##*/}"
-          SAFE_NAME=$(echo $NAME | sed 's/[^a-zA-Z0-9]//g' | tr '[:upper:]' '[:lower:]')
           ACTOR=$(echo $GITHUB_ACTOR | tr '[:upper:]' '[:lower:]')
-          GROUP="com.github.$ACTOR.$SAFE_NAME"
+          SAFE_NAME=$(echo $NAME | sed 's/[^a-zA-Z0-9]//g' | tr '[:upper:]' '[:lower:]')
+          SAFE_ACTOR=$(echo $ACTOR | sed 's/[^a-zA-Z0-9]//g' | tr '[:upper:]' '[:lower:]')
+          GROUP="com.github.$SAFE_ACTOR.$SAFE_NAME"
 
           # Replace placeholders in the template-cleanup files
           sed -i "s/%NAME%/$NAME/g" .github/template-cleanup/*
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c49c23f..703bf30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,17 +3,9 @@
 # IntelliJ Platform Plugin Template Changelog
 
 ## [Unreleased]
-### Added
-
-### Changed
-
-### Deprecated
-
-### Removed
-
 ### Fixed
+- Template Cleanup: escape GitHub username to avoid incorrect characters in class package name
 
-### Security
 ## [0.8.0]
 ### Added
 - Dependabot integration