diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0942036a23cc191886d62ec8074c729877a301b4..eda375e2258cd84e7e632307e07327fc282bbc0e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,9 +14,8 @@ default:
   # Bootstrap Cookiecutter template to test provided ci pipeline template
   before_script:
     - python --version # For debugging
-    - cookiecutter --no-input --overwrite-if-exists ./
+    - cookiecutter --no-input --overwrite-if-exists --output-dir . .
     - cd my_awesome_app
-    - git init
 
 # Override unit test before script
 .run_unit_test_version_base:
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 39c26b6952a750c5e6ec7e5abd257a97e390ffde..0000000000000000000000000000000000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "{{cookiecutter.project_slug}}/cmake/cmake-extra-utils"]
-	path = {{cookiecutter.project_slug}}/cmake/cmake-extra-utils
-	url = https://github.com/LecrisUT/CMakeExtraUtils.git
diff --git a/README.md b/README.md
index ffd874a4b6c8872e16339bd38092390235fcb2dd..8f9500e829779b23e5bf1440fa0a8b2a2b3b63ad 100644
--- a/README.md
+++ b/README.md
@@ -42,4 +42,5 @@ cookiecutter https://git.astron.nl/templates/python-binary-wheel-package.git
 ```
 
 ## License
-This project is licensed under the Apache License Version 2.0
+
+This project is licensed under the Apache License Version 2.0
\ No newline at end of file
diff --git a/hooks/post_gen_project.sh b/hooks/post_gen_project.sh
new file mode 100644
index 0000000000000000000000000000000000000000..708c8f1b398c420f36af0631207e421a7ddf5079
--- /dev/null
+++ b/hooks/post_gen_project.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+git init
+git add --all
+git commit -m "initial commit"
+git tag v0.0.1
+git submodule add https://github.com/LecrisUT/CMakeExtraUtils.git cmake/cmake-extra-utils
\ No newline at end of file
diff --git a/{{cookiecutter.project_slug}}/README.md b/{{cookiecutter.project_slug}}/README.md
index 428513b663ccf3d32b9df1cd29c04a98134cfed5..4e6e8c75c5bbc2a58e17e98bb27d8b7bf49143b0 100644
--- a/{{cookiecutter.project_slug}}/README.md
+++ b/{{cookiecutter.project_slug}}/README.md
@@ -1,9 +1,8 @@
 # {{cookiecutter.project_name}}
 
-<!-- TODO: replace  -->
 ![Build status]({{cookiecutter.project_url}}/badges/main/pipeline.svg)
 ![Test coverage]({{cookiecutter.project_url}}/badges/main/coverage.svg)
-<!-- ![Latest release](https://git.astron.nl/templates/python-package/badges/main/release.svg) -->
+![Latest release]({{cookiecutter.project_url}}/badges/main/release.svg)
 
 {{cookiecutter.description}}
 
diff --git a/{{cookiecutter.project_slug}}/cmake/cmake-extra-utils b/{{cookiecutter.project_slug}}/cmake/cmake-extra-utils
deleted file mode 160000
index 26450da9dceea86a809fe1a38c095a0c988a6159..0000000000000000000000000000000000000000
--- a/{{cookiecutter.project_slug}}/cmake/cmake-extra-utils
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 26450da9dceea86a809fe1a38c095a0c988a6159
diff --git a/{{cookiecutter.project_slug}}/tox.ini b/{{cookiecutter.project_slug}}/tox.ini
index 3edee4680d148b3d780c2a9186b4fd2749f98d17..30966a5a4f72d399397bc3485d1ce998fb696223 100644
--- a/{{cookiecutter.project_slug}}/tox.ini
+++ b/{{cookiecutter.project_slug}}/tox.ini
@@ -11,6 +11,7 @@ setenv =
     LANGUAGE=en_US
     LC_ALL=en_US.UTF-8
     PYTHONWARNINGS=default::DeprecationWarning
+    DYNAMIC_VERSION_SOURCE={toxinidir}
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/tests/requirements.txt