diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ccc4c1e..114a46c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -49,6 +49,13 @@ jobs:
           branch: main
           unprotect_reviews: true
 
+      - name: Publish Collection on Ansible Galaxy
+        uses: artis3n/ansible_galaxy_collection@v2
+        with:
+          api_key: '${{ secrets.GALAXY_API_KEY }}'
+          build: false
+          publish: true
+
       - name: Push changes to repository
         run: git push origin && git push --tags
 
@@ -59,13 +66,6 @@ jobs:
           body: ${{ steps.release-changelog.outputs.content }}
           token: ${{ secrets.RELEASE_BOT_GITHUB_TOKEN }}
 
-      - name: Publish Collection on Ansible Galaxy
-        uses: artis3n/ansible_galaxy_collection@v2
-        with:
-          api_key: '${{ secrets.GALAXY_API_KEY }}'
-          build: false
-          publish: true
-
   clean_changelog:
     if: github.event.pull_request.merged == true && needs.changelog.outputs.release-type == 'no-release'
     needs: [ changelog ]
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f19c70b..48c2533 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All changes that impact users of this module are documented in this file, in the [Common Changelog](https://common-changelog.org) format with some additional specifications defined in the CONTRIBUTING file. This codebase adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased [no-release]
+
+_Modifications made in this changeset do not add, remove or alter any behavior, dependency, API or functionality of the software. They only change non-functional parts of the repository, such as the README file or CI workflows._
+
 ## 3.0.0 - 2025-12-19
 
 _Full changeset and discussions: [#58](https://github.com/OpenTermsArchive/deployment/pull/58)._
diff --git a/playbooks/deploy.yml b/playbooks/deploy.yml
index 6f7535d..f32b6fa 100644
--- a/playbooks/deploy.yml
+++ b/playbooks/deploy.yml
@@ -92,7 +92,7 @@
       block:
         - name: Load contribution-tool config
           ansible.builtin.include_role:
-            name: ota/contribution-tool
+            name: ota/contribution_tool
             public: true
             apply:
               tags: [always]
@@ -120,7 +120,7 @@
       block:
         - name: Load federation-api config
           ansible.builtin.include_role:
-            name: ota/federation-api
+            name: ota/federation_api
             public: true
             apply:
               tags: [always]
@@ -208,7 +208,7 @@
       block:
         - name: Setup contribution-tool
           ansible.builtin.include_role:
-            name: ota/contribution-tool
+            name: ota/contribution_tool
             public: true
 
     # Federation-api: application deployment
@@ -217,7 +217,7 @@
       block:
         - name: Setup federation-api
           ansible.builtin.include_role:
-            name: ota/federation-api
+            name: ota/federation_api
             public: true
 
     # Process management & web server (common)
diff --git a/roles/ota/contribution-tool/README.md b/roles/ota/contribution_tool/README.md
similarity index 100%
rename from roles/ota/contribution-tool/README.md
rename to roles/ota/contribution_tool/README.md
diff --git a/roles/ota/contribution-tool/defaults/main.yml b/roles/ota/contribution_tool/defaults/main.yml
similarity index 100%
rename from roles/ota/contribution-tool/defaults/main.yml
rename to roles/ota/contribution_tool/defaults/main.yml
diff --git a/roles/ota/contribution-tool/tasks/main.yml b/roles/ota/contribution_tool/tasks/main.yml
similarity index 100%
rename from roles/ota/contribution-tool/tasks/main.yml
rename to roles/ota/contribution_tool/tasks/main.yml
diff --git a/roles/ota/federation-api/README.md b/roles/ota/federation_api/README.md
similarity index 100%
rename from roles/ota/federation-api/README.md
rename to roles/ota/federation_api/README.md
diff --git a/roles/ota/federation-api/defaults/main.yml b/roles/ota/federation_api/defaults/main.yml
similarity index 100%
rename from roles/ota/federation-api/defaults/main.yml
rename to roles/ota/federation_api/defaults/main.yml
diff --git a/roles/ota/federation-api/tasks/main.yml b/roles/ota/federation_api/tasks/main.yml
similarity index 100%
rename from roles/ota/federation-api/tasks/main.yml
rename to roles/ota/federation_api/tasks/main.yml