diff --git a/template/.github/workflows/{% if AddCitation %}next_steps_citation.yml{% endif %} b/template/.github/workflows/{% if AddCitation %}next_steps_citation.yml{% endif %}
index 48269288..bd6c1f00 100644
--- a/template/.github/workflows/{% if AddCitation %}next_steps_citation.yml{% endif %}	
+++ b/template/.github/workflows/{% if AddCitation %}next_steps_citation.yml{% endif %}	
@@ -13,7 +13,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          filename: .github/next_steps/02_citation.md
+          filename: .github/workflows/next_steps_citation_issue.md
         id: citation
       - name: List created issues
         run: |
@@ -23,7 +23,8 @@ jobs:
         run: |
           git config --global user.name 'NLeSC Python template'
           git config --global user.email 'nlesc-python-template@users.noreply.github.com'
+          git pull # other next step workflows may push changes before
           git rm .github/workflows/next_steps_citation.yml
-          git rm -r .github/next_steps
-          git commit -am "Cleanup automated next steps issue generator"
+          git rm .github/workflows/next_steps_citation_issue.md
+          git commit -am "Cleanup automated next steps issue generator for citation"
           git push
diff --git a/template/.github/next_steps/{% if AddCitation %}02_citation.md{% endif %}.jinja b/template/.github/workflows/{% if AddCitation %}next_steps_citation_issue.md{% endif %}.jinja
similarity index 100%
rename from template/.github/next_steps/{% if AddCitation %}02_citation.md{% endif %}.jinja
rename to template/.github/workflows/{% if AddCitation %}next_steps_citation_issue.md{% endif %}.jinja
diff --git a/template/.github/workflows/{% if AddOnlineDocumentation %}next_steps_online_documentation.yml{% endif %} b/template/.github/workflows/{% if AddOnlineDocumentation %}next_steps_online_documentation.yml{% endif %}
index 1bc71b38..c9f29e84 100644
--- a/template/.github/workflows/{% if AddOnlineDocumentation %}next_steps_online_documentation.yml{% endif %}	
+++ b/template/.github/workflows/{% if AddOnlineDocumentation %}next_steps_online_documentation.yml{% endif %}	
@@ -8,12 +8,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Create readthedocs issue
+      - name: Create online documentation issue
         uses: JasonEtco/create-an-issue@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          filename: .github/next_steps/03_readthedocs.md
+          filename: .github/workflows/next_steps_online_documentation_issue.md
         id: readthedocs
       - name: List created issues
         run: |
@@ -23,7 +23,8 @@ jobs:
         run: |
           git config --global user.name 'NLeSC Python template'
           git config --global user.email 'nlesc-python-template@users.noreply.github.com'
+          git pull # other next step workflows may push changes before
           git rm .github/workflows/next_steps_online_documentation.yml
-          git rm -r .github/next_steps
-          git commit -am "Cleanup automated next steps issue generator"
+          git rm .github/workflows/next_steps_online_documentation_issue.md
+          git commit -am "Cleanup automated next steps issue generator for online documentation"
           git push
diff --git a/template/.github/next_steps/{% if AddOnlineDocumentation %}03_readthedocs.md{% endif %}.jinja b/template/.github/workflows/{% if AddOnlineDocumentation %}next_steps_online_documentation_issue.md{% endif %}.jinja
similarity index 100%
rename from template/.github/next_steps/{% if AddOnlineDocumentation %}03_readthedocs.md{% endif %}.jinja
rename to template/.github/workflows/{% if AddOnlineDocumentation %}next_steps_online_documentation_issue.md{% endif %}.jinja