diff --git a/hooks/post_gen_project.sh b/hooks/post_gen_project.sh
index feeb07f..699250c 100644
--- a/hooks/post_gen_project.sh
+++ b/hooks/post_gen_project.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env sh
 
 if hash git 2>/dev/null; then
+    cd {{cookiecutter.collection_name}}
     git init
     git remote add origin gitea@{{ cookiecutter.git_server }}/xoxys.{{ cookiecutter.collection_name }}.git
 fi
diff --git a/{{cookiecutter.collection_namespace}}/{{cookiecutter.collection_name}}/README.md b/{{cookiecutter.collection_namespace}}/{{cookiecutter.collection_name}}/README.md
index 91e0956..3c13cec 100644
--- a/{{cookiecutter.collection_namespace}}/{{cookiecutter.collection_name}}/README.md
+++ b/{{cookiecutter.collection_namespace}}/{{cookiecutter.collection_name}}/README.md
@@ -3,7 +3,7 @@
 [![Build Status](https://img.shields.io/drone/build/ansible/{{ cookiecutter.collection_namespace }}.{{ cookiecutter.collection_name }}?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/ansible/{{ cookiecutter.author }}.{{ cookiecutter.collection_name }})
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg?label=license)](LICENSE)
 
-{{ collection_description_short }}.
+{{ cookiecutter.collection_description_short }}.
 
 ## License
 
diff --git a/{{cookiecutter.collection_namespace}}/{{cookiecutter.collection_name}}/galaxy.yml b/{{cookiecutter.collection_namespace}}/{{cookiecutter.collection_name}}/galaxy.yml
index a883d00..514aac5 100644
--- a/{{cookiecutter.collection_namespace}}/{{cookiecutter.collection_name}}/galaxy.yml
+++ b/{{cookiecutter.collection_namespace}}/{{cookiecutter.collection_name}}/galaxy.yml
@@ -3,13 +3,13 @@ name: {{ cookiecutter.collection_name }}
 version: 1.0.0
 readme: README.md
 authors:
-  - {{ author_full }} <{{ author_email }}>
-description: {{ collection_description_short }}
+  - {{ cookiecutter.author_full }} <{{ cookiecutter.author_email }}>
+description: {{ cookiecutter.collection_description_short }}
 license:
   - MIT
 license_file: "LICENSE"
 tags:
-  - {{ collection_category }}
+  - {{ cookiecutter.collection_category }}
 dependencies: {}
 repository: https://gitea.rknet.org/ansible/{{ cookiecutter.collection_namespace }}.{{ cookiecutter.collection_name }}
 homepage: https://thegeeklab.de/