diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5d80d89..26835eb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -40,8 +40,7 @@ jobs:
         run: pip install -r ci_requirements.txt
 
       - name: Run Copier
-        run: |
-          copier --defaults -d setup_dbt_project=True -d setup_dbt_profile=True -d setup_ci_cd=True -d setup_precommit=True -d setup_airflow_dag=True -d dbt_project_dir="." -d dbt_project_name="balboa" -d is_new_project=True  -d airflow_profile_path="automate/dbt" -d yml_dags_path="orchestrate/dag_yml_definitions" -d dags_path="orchestrate/dags" -d setup_precommit=True -d use_sqlfluff=True -d use_yamllint=True -d use_dbt_checkpoint=True -a ../copier-answers.yml copy ./ generated/
+        run: copier copy --data-file data.yml ./ generated/ --trust
 
       # run dbt debug and dbt compile
       - name: Run dbt commands
diff --git a/ci_requirements.txt b/ci_requirements.txt
index 9a110a2..9fe2d4b 100644
--- a/ci_requirements.txt
+++ b/ci_requirements.txt
@@ -1,4 +1,4 @@
-dbt-coves==1.8.15
+git+https://github.com/datacoves/dbt-coves.git@support-pydantic-2.0
 dbt-core==1.8.9
 dbt-snowflake==1.8.4
 pre-commit==3.7.1
\ No newline at end of file
diff --git a/copier-answers.yml b/copier-answers.yml
deleted file mode 100644
index c270f93..0000000
--- a/copier-answers.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-ci_provider: github
-dags_path: orchestrate/dags
-dbt_adapter: snowflake
-use_dbt_checkpoint: true
-use_sqlfluff: true
-use_yamllint: true
-yml_dags_path: orchestrate/dag_yml_definitions
-setup_dbtcoves_config: true
-setup_dbtcoves_templates: true
diff --git a/copier.yml b/copier.yml
index 6564ca2..afd1633 100644
--- a/copier.yml
+++ b/copier.yml
@@ -1,5 +1,20 @@
+_tasks:
+  - echo 'Hello template'
+  # - command: ["git init"]
+  # only run on project setup
+  # when: "{{ _copier_operation == 'copy' }}"
+
+_message_before_copy: |
+  Thanks for generating a project using our template.
+
+_message_after_copy: |
+  Your project "{{ dbt_project_name }}" has been created successfully!
+
+_message_after_update: |
+  Your project "{{ dbt_project_name }}" has been updated successfully!
+  In case there
+
 _exclude:
-  - copier-answers.yml
   - ci_requirements.txt
   - test_load_dagbag.py
   - copier.yaml
@@ -9,64 +24,119 @@ _exclude:
   - "*.py[co]"
   - __pycache__
   - .DS_Store
+  - data.yml
+  - answers.yml
 
-ci_provider:
+services:
   type: str
+  multiselect: true
+  help: What services do you want to setup?
   choices:
-    - github
-    - gitlab
-  when: "{{setup_ci_cd}}"
-  default: github
-  help: CI/CD provider
+    Base dbt project: setup_dbt_project
+    dbt profile for automated runs: setup_dbt_profile
+    setup_ci_cd: setup_ci_cd
+    Linting with SQLFluff, dbt-checkpoint and-or YMLLint: setup_precommit
+    Sample Airflow DAGs: setup_airflow_dags
+    dbt-coves config and-or templates: setup_dbtcoves
+
+# dbt project related vars
+dbt_project_dir:
+  type: str
+  when: "{{'setup_dbt_project' in services}}"
+  default: "{{ datacoves_env.get('DATACOVES__DBT_HOME', '.') }}"
+  help: dbt project directory
+
+dbt_project_name:
+  type: str
+  when: "{{'setup_dbt_project' in services}}"
+  help: What is the name of the dbt project?
 
+# Airflow related vars
 dags_path:
   type: str
-  when: "{{airflow_dags_confirm_path}}"
-  default: "{{tentative_dags_path}}"
+  when: "{{'setup_airflow_dags' in services or 'setup_ci_cd' in services}}"
+  default: "{{ datacoves_env.get('DATACOVES__AIRFLOW_DAGS_PATH', 'orchestrate/dags') }}"
   help: Airflow DAGs path
 
+airflow_artifacts_path:
+  type: str
+  when: "{{'setup_ci_cd' in services}}"
+  default: "{{ datacoves_env.get('DATACOVES__AIRFLOW_DAGS_PATH', 'orchestrate/dags').split('/')[0] }}"
+  help: Airflow Artifacts path for unit tests
+
 yml_dags_path:
   type: str
-  when: "{{yml_dags_confirm_path}}"
-  default: "{{tentative_yml_dags_path}}"
+  when: "{{'setup_airflow_dags' in services and yml_dags_confirm_path}}"
+  default: "{{datacoves_env.get('DATACOVES__AIRFLOW_DAGS_YML_PATH', 'orchestrate/dags_yml_definitions')}}"
   help: Airflow YML Dags path
 
+# dbt-coves related vars
+add_dbtcoves_config_and_templates:
+  type: bool
+  default: false
+  when: "{{not 'setup_dbtcoves' in services and 'setup_dbt_project' in services}}"
+  help: Add dbt-coves config and templates?
+
+setup_dbtcoves_config:
+  type: bool
+  default: true
+  when: "{{'setup_dbtcoves' in services}}"
+  help: Setup dbt-coves config?
+
+setup_dbtcoves_templates:
+  type: bool
+  default: true
+  when: "{{'setup_dbtcoves' in services}}"
+  help: Setup dbt-coves templates?
+
+# CI / CD Related vars
+
+ci_provider:
+  type: str
+  choices:
+    - github
+    - gitlab
+  when: "{{'setup_ci_cd' in services}}"
+  default: github
+  help: CI/CD provider
+
 use_dbt_checkpoint:
   type: bool
   default: false
-  when: "{{setup_precommit}}"
+  when: "{{'setup_precommit' in services}}"
   help: use dbt-checkpoint?
 
 use_sqlfluff:
   type: bool
   default: false
-  when: "{{setup_precommit}}"
+  when: "{{'setup_precommit' in services}}"
   help: use Sqlfluff?
 
 use_yamllint:
   type: bool
   default: false
-  when: "{{setup_precommit}}"
+  when: "{{'setup_precommit' in services}}"
   help: use Yamllint?
 
-add_dbtcoves_config_and_templates:
-  type: bool
-  default: false
-  when: "{{not setup_dbt_coves and setup_dbt_project}}"
-  help: Add dbt-coves config and templates?
+dbt_checkpoint_version:
+  type: str
+  help: What dbt-checkpoint version are you using?
+  default: "{{ datacoves_env.get('DATACOVES__DBT_CHECKPOINT_VERSION', 'v2.0.6') }}"
+  when: "{{use_dbt_checkpoint}}"
 
-setup_dbtcoves_config:
-  type: bool
-  default: true
-  when: "{{setup_dbt_coves}}"
-  help: Setup dbt-coves config?
+yamllint_version:
+  type: str
+  help: What yamllint version are you using?
+  default: "{{ datacoves_env.get('DATACOVES__YAMLLINT_VERSION', 'v1.36.2') }}"
+  when: "{{use_yamllint}}"
 
-setup_dbtcoves_templates:
-  type: bool
-  default: true
-  when: "{{setup_dbt_coves}}"
-  help: Setup dbt-coves templates?
+sqlfluff_version:
+  type: str
+  help: What sqlfluff version are you using?
+  default: "{{ datacoves_env.get('DATACOVES__SQLFLUFF_VERSION', '3.1.1') }}"
+  when: "{{use_sqlfluff}}"
 
+# dbt related vars
 dbt_adapter:
   type: str
   choices:
@@ -75,15 +145,11 @@ dbt_adapter:
     - redshift
     - databricks
   help: What dbt adapter are you using?
-  when: "{{not datacoves_dbt_adapter and (setup_dbt_profile or setup_ci_cd or setup_sqlfluff)}}"
-  default: snowflake
-
-dbt_checkpoint_version:
-  type: str
-  help: What dbt-checkpoint version are you using?
-  when: "{{use_dbt_checkpoint and ask_dbt_checkpoint_version}}"
+  when: "{{not datacoves_dbt_adapter and ('setup_dbt_profile' in services or setup_ci_cd or setup_sqlfluff)}}"
+  default: "{{ datacoves_env.get('DATACOVES__DBT_ADAPTER', 'snowflake') }}"
 
-yamllint_version:
+dbt_profiles_path:
   type: str
-  help: What yamllint version are you using?
-  when: "{{use_yamllint and ask_yamllint_version}}"
+  when: "{{ 'setup_dbt_profile' in services or 'setup_ci_cd' in services }}"
+  default: "{{ datacoves_env.get('DATACOVES__AIRFLOW_DBT_PROFILE_PATH', 'automate/dbt') }}"
+  help: dbt Profile Path for automated runs
diff --git a/data.yml b/data.yml
new file mode 100644
index 0000000..81112b6
--- /dev/null
+++ b/data.yml
@@ -0,0 +1,32 @@
+services:
+  - setup_dbt_project
+  - setup_dbt_profile
+  - setup_ci_cd
+  - setup_precommit
+  - setup_airflow_dags
+  - setup_dbtcoves
+dbt_project_dir: "."
+dbt_project_name: "mock_project"
+is_new_project: true
+dbt_profiles_path: "automate/dbt"
+yml_dags_path: "orchestrate/dag_yml_definitions"
+dags_path: "orchestrate/dags"
+use_sqlfluff: true
+use_yamllint: true
+use_dbt_checkpoint: true
+ci_provider: "github"
+datacoves_env:
+  DATACOVES__AIRFLOW_DBT_PROFILE_PATH: "automate/dbt"
+  DATACOVES__DBT_HOME: "."
+  DATACOVES__AIRFLOW_DAGS_PATH: "orchestrate/dags"
+  DATACOVES__AIRFLOW_DAGS_YML_PATH: "orchestrate/dags_yml_definitions"
+airflow_artifacts_path: "orchestrate"
+setup_dbtcoves_config: true
+setup_dbtcoves_templates: true
+dbt_checkpoint_version: v2.0.6
+yamllint_version: "v1.36.2"
+sqlfluff_version: "3.1.1"
+dbt_adapter: "snowflake"
+add_dbtcoves_config_and_templates: true
+dbt_core_version: "1.8.9"
+dbt_adapter_version: "1.8.4"
diff --git a/{% if setup_airflow_dag%}{{ dags_path }}{% endif %}/sample_dag.py b/{% if 'setup_airflow_dags' in services %}{{ dags_path }}{% endif %}/sample_dag.py
similarity index 100%
rename from {% if setup_airflow_dag%}{{ dags_path }}{% endif %}/sample_dag.py
rename to {% if 'setup_airflow_dags' in services %}{{ dags_path }}{% endif %}/sample_dag.py
diff --git a/{% if setup_airflow_dag %}{{ yml_dags_path }}{% endif %}/sample_dag.yml b/{% if 'setup_airflow_dags' in services %}{{ yml_dags_path }}{% endif %}/sample_dag.yml
similarity index 100%
rename from {% if setup_airflow_dag %}{{ yml_dags_path }}{% endif %}/sample_dag.yml
rename to {% if 'setup_airflow_dags' in services %}{{ yml_dags_path }}{% endif %}/sample_dag.yml
diff --git a/{% if setup_precommit %}{{ dbt_project_dir }}{% endif %}/{% if use_sqlfluff %}.sqlfluffignore{% endif %} b/{% if 'setup_ci_cd' in services %}{{ dbt_project_dir }}{% endif %}/{% if use_sqlfluff %}.sqlfluffignore{% endif %}
similarity index 100%
rename from {% if setup_precommit %}{{ dbt_project_dir }}{% endif %}/{% if use_sqlfluff %}.sqlfluffignore{% endif %}
rename to {% if 'setup_ci_cd' in services %}{{ dbt_project_dir }}{% endif %}/{% if use_sqlfluff %}.sqlfluffignore{% endif %}
diff --git a/{% if setup_precommit %}{{ dbt_project_dir }}{% endif %}/{% if use_sqlfluff %}.sqlfluff{% endif %}.jinja b/{% if 'setup_ci_cd' in services %}{{ dbt_project_dir }}{% endif %}/{% if use_sqlfluff %}.sqlfluff{% endif %}.jinja
similarity index 100%
rename from {% if setup_precommit %}{{ dbt_project_dir }}{% endif %}/{% if use_sqlfluff %}.sqlfluff{% endif %}.jinja
rename to {% if 'setup_ci_cd' in services %}{{ dbt_project_dir }}{% endif %}/{% if use_sqlfluff %}.sqlfluff{% endif %}.jinja
diff --git a/{% if setup_dbt_profile %}{{ airflow_profile_path }}{%endif%}/profiles.yml.jinja b/{% if 'setup_dbt_profile' in services %}{{ dbt_profiles_path }}{%endif%}/profiles.yml.jinja
similarity index 100%
rename from {% if setup_dbt_profile %}{{ airflow_profile_path }}{%endif%}/profiles.yml.jinja
rename to {% if 'setup_dbt_profile' in services %}{{ dbt_profiles_path }}{%endif%}/profiles.yml.jinja
diff --git a/{% if setup_dbt_project %}.gitignore{% endif %} b/{% if 'setup_dbt_project' in services %}.gitignore{% endif %}
similarity index 100%
rename from {% if setup_dbt_project %}.gitignore{% endif %}
rename to {% if 'setup_dbt_project' in services %}.gitignore{% endif %}
diff --git a/{% if setup_dbt_project %}README.md{% endif %} b/{% if 'setup_dbt_project' in services %}README.md{% endif %}
similarity index 100%
rename from {% if setup_dbt_project %}README.md{% endif %}
rename to {% if 'setup_dbt_project' in services %}README.md{% endif %}
diff --git a/{% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/analyses/.gitkeep b/{% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/analyses/.gitkeep
similarity index 100%
rename from {% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/analyses/.gitkeep
rename to {% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/analyses/.gitkeep
diff --git a/{% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/dbt_project.yml.jinja b/{% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/dbt_project.yml.jinja
similarity index 100%
rename from {% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/dbt_project.yml.jinja
rename to {% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/dbt_project.yml.jinja
diff --git a/{% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/macros/.gitkeep b/{% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/macros/.gitkeep
similarity index 100%
rename from {% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/macros/.gitkeep
rename to {% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/macros/.gitkeep
diff --git a/{% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/models/L1_staging/.gitkeep b/{% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/models/L1_staging/.gitkeep
similarity index 100%
rename from {% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/models/L1_staging/.gitkeep
rename to {% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/models/L1_staging/.gitkeep
diff --git a/{% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/models/L1_staging/my_model.sql b/{% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/models/L1_staging/my_model.sql
similarity index 100%
rename from {% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/models/L1_staging/my_model.sql
rename to {% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/models/L1_staging/my_model.sql
diff --git a/{% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/models/L1_staging/my_model.yml b/{% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/models/L1_staging/my_model.yml
similarity index 100%
rename from {% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/models/L1_staging/my_model.yml
rename to {% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/models/L1_staging/my_model.yml
diff --git a/{% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/models/L1_staging/source.yml b/{% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/models/L1_staging/source.yml
similarity index 100%
rename from {% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/models/L1_staging/source.yml
rename to {% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/models/L1_staging/source.yml
diff --git a/{% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/models/L2_core/.gitkeep b/{% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/models/L2_core/.gitkeep
similarity index 100%
rename from {% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/models/L2_core/.gitkeep
rename to {% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/models/L2_core/.gitkeep
diff --git a/{% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/models/L3_marts/.gitkeep b/{% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/models/L3_marts/.gitkeep
similarity index 100%
rename from {% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/models/L3_marts/.gitkeep
rename to {% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/models/L3_marts/.gitkeep
diff --git a/{% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/packages.yml b/{% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/packages.yml
similarity index 100%
rename from {% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/packages.yml
rename to {% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/packages.yml
diff --git a/{% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/seeds/.gitkeep b/{% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/seeds/.gitkeep
similarity index 100%
rename from {% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/seeds/.gitkeep
rename to {% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/seeds/.gitkeep
diff --git a/{% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/snapshots/.gitkeep b/{% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/snapshots/.gitkeep
similarity index 100%
rename from {% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/snapshots/.gitkeep
rename to {% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/snapshots/.gitkeep
diff --git a/{% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/tests/.gitkeep b/{% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/tests/.gitkeep
similarity index 100%
rename from {% if setup_dbt_project %}{{ dbt_project_dir }}{%endif%}/tests/.gitkeep
rename to {% if 'setup_dbt_project' in services %}{{ dbt_project_dir }}{%endif%}/tests/.gitkeep
diff --git a/{% if setup_dbt_coves or add_dbtcoves_config_and_templates %}{{ dbt_project_dir }}{% endif %}/.dbt_coves/{% if setup_dbtcoves_config or add_dbtcoves_config_and_templates %}config.yml{% endif %} b/{% if 'setup_dbtcoves' in services or add_dbtcoves_config_and_templates %}{{ dbt_project_dir }}{% endif %}/.dbt_coves/{% if setup_dbtcoves_config or add_dbtcoves_config_and_templates %}config.yml{% endif %}
similarity index 100%
rename from {% if setup_dbt_coves or add_dbtcoves_config_and_templates %}{{ dbt_project_dir }}{% endif %}/.dbt_coves/{% if setup_dbtcoves_config or add_dbtcoves_config_and_templates %}config.yml{% endif %}
rename to {% if 'setup_dbtcoves' in services or add_dbtcoves_config_and_templates %}{{ dbt_project_dir }}{% endif %}/.dbt_coves/{% if setup_dbtcoves_config or add_dbtcoves_config_and_templates %}config.yml{% endif %}
diff --git a/{% if setup_dbt_coves or add_dbtcoves_config_and_templates %}{{ dbt_project_dir }}{% endif %}/.dbt_coves/{% if setup_dbtcoves_templates %}templates{% endif %}/model_props.yml b/{% if 'setup_dbtcoves' in services or add_dbtcoves_config_and_templates %}{{ dbt_project_dir }}{% endif %}/.dbt_coves/{% if setup_dbtcoves_templates %}templates{% endif %}/model_props.yml
similarity index 100%
rename from {% if setup_dbt_coves or add_dbtcoves_config_and_templates %}{{ dbt_project_dir }}{% endif %}/.dbt_coves/{% if setup_dbtcoves_templates %}templates{% endif %}/model_props.yml
rename to {% if 'setup_dbtcoves' in services or add_dbtcoves_config_and_templates %}{{ dbt_project_dir }}{% endif %}/.dbt_coves/{% if setup_dbtcoves_templates %}templates{% endif %}/model_props.yml
diff --git a/{% if setup_dbt_coves or add_dbtcoves_config_and_templates %}{{ dbt_project_dir }}{% endif %}/.dbt_coves/{% if setup_dbtcoves_templates %}templates{% endif %}/source_props.yml b/{% if 'setup_dbtcoves' in services or add_dbtcoves_config_and_templates %}{{ dbt_project_dir }}{% endif %}/.dbt_coves/{% if setup_dbtcoves_templates %}templates{% endif %}/source_props.yml
similarity index 100%
rename from {% if setup_dbt_coves or add_dbtcoves_config_and_templates %}{{ dbt_project_dir }}{% endif %}/.dbt_coves/{% if setup_dbtcoves_templates %}templates{% endif %}/source_props.yml
rename to {% if 'setup_dbtcoves' in services or add_dbtcoves_config_and_templates %}{{ dbt_project_dir }}{% endif %}/.dbt_coves/{% if setup_dbtcoves_templates %}templates{% endif %}/source_props.yml
diff --git a/{% if setup_dbt_coves or add_dbtcoves_config_and_templates %}{{ dbt_project_dir }}{% endif %}/.dbt_coves/{% if setup_dbtcoves_templates %}templates{% endif %}/staging_model.sql b/{% if 'setup_dbtcoves' in services or add_dbtcoves_config_and_templates %}{{ dbt_project_dir }}{% endif %}/.dbt_coves/{% if setup_dbtcoves_templates %}templates{% endif %}/staging_model.sql
similarity index 100%
rename from {% if setup_dbt_coves or add_dbtcoves_config_and_templates %}{{ dbt_project_dir }}{% endif %}/.dbt_coves/{% if setup_dbtcoves_templates %}templates{% endif %}/staging_model.sql
rename to {% if 'setup_dbtcoves' in services or add_dbtcoves_config_and_templates %}{{ dbt_project_dir }}{% endif %}/.dbt_coves/{% if setup_dbtcoves_templates %}templates{% endif %}/staging_model.sql
diff --git a/{% if setup_dbt_coves or add_dbtcoves_config_and_templates %}{{ dbt_project_dir }}{% endif %}/.dbt_coves/{% if setup_dbtcoves_templates %}templates{% endif %}/staging_model_props.yml b/{% if 'setup_dbtcoves' in services or add_dbtcoves_config_and_templates %}{{ dbt_project_dir }}{% endif %}/.dbt_coves/{% if setup_dbtcoves_templates %}templates{% endif %}/staging_model_props.yml
similarity index 100%
rename from {% if setup_dbt_coves or add_dbtcoves_config_and_templates %}{{ dbt_project_dir }}{% endif %}/.dbt_coves/{% if setup_dbtcoves_templates %}templates{% endif %}/staging_model_props.yml
rename to {% if 'setup_dbtcoves' in services or add_dbtcoves_config_and_templates %}{{ dbt_project_dir }}{% endif %}/.dbt_coves/{% if setup_dbtcoves_templates %}templates{% endif %}/staging_model_props.yml
diff --git a/{%if setup_ci_cd and ci_provider=='gitlab'%}.gitlab-ci.yml{%endif%}.jinja b/{%if 'Initial CI-CD scripts' in services and ci_provider=='gitlab'%}.gitlab-ci.yml{%endif%}.jinja
similarity index 100%
rename from {%if setup_ci_cd and ci_provider=='gitlab'%}.gitlab-ci.yml{%endif%}.jinja
rename to {%if 'Initial CI-CD scripts' in services and ci_provider=='gitlab'%}.gitlab-ci.yml{%endif%}.jinja
diff --git a/{%if setup_ci_cd and ci_provider=='github'%}.github{%endif%}/workflows/pull_request_build.yml.jinja b/{%if 'setup_ci_cd' in services and ci_provider=='github'%}.github{%endif%}/workflows/pull_request_build.yml.jinja
similarity index 97%
rename from {%if setup_ci_cd and ci_provider=='github'%}.github{%endif%}/workflows/pull_request_build.yml.jinja
rename to {%if 'setup_ci_cd' in services and ci_provider=='github'%}.github{%endif%}/workflows/pull_request_build.yml.jinja
index 50cb598..0d7d9ca 100644
--- a/{%if setup_ci_cd and ci_provider=='github'%}.github{%endif%}/workflows/pull_request_build.yml.jinja	
+++ b/{%if 'setup_ci_cd' in services and ci_provider=='github'%}.github{%endif%}/workflows/pull_request_build.yml.jinja	
@@ -35,7 +35,7 @@ jobs:
         {% raw %} working-directory: /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }}{%endraw%}/{{dbt_project_dir}}
 
     env:
-      {% raw %}DBT_PROFILES_DIR: /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }}{%endraw%}/{{ airflow_profile_path }}
+      {% raw %}DBT_PROFILES_DIR: /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }}{%endraw%}/{{ dbt_profiles_path }}
       {% raw %}DATACOVES__DBT_HOME: /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }}{%endraw%}/{{dbt_project_dir}}
 
       {% if 'snowflake' in dbt_adapter %}
diff --git a/{%if setup_ci_cd and ci_provider=='github'%}.github{%endif%}/workflows/push-to-main.yml.jinja b/{%if 'setup_ci_cd' in services and ci_provider=='github'%}.github{%endif%}/workflows/push-to-main.yml.jinja
similarity index 97%
rename from {%if setup_ci_cd and ci_provider=='github'%}.github{%endif%}/workflows/push-to-main.yml.jinja
rename to {%if 'setup_ci_cd' in services and ci_provider=='github'%}.github{%endif%}/workflows/push-to-main.yml.jinja
index 1cd531a..53e8378 100644
--- a/{%if setup_ci_cd and ci_provider=='github'%}.github{%endif%}/workflows/push-to-main.yml.jinja	
+++ b/{%if 'setup_ci_cd' in services and ci_provider=='github'%}.github{%endif%}/workflows/push-to-main.yml.jinja	
@@ -43,7 +43,7 @@ jobs:
         {% raw %}working-directory: /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }}{% endraw%}/{{dbt_project_dir}}
 
     env:
-      {% raw %}DBT_PROFILES_DIR: /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }}{% endraw%}/{{airflow_profile_path}}
+      {% raw %}DBT_PROFILES_DIR: /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }}{% endraw%}/{{dbt_profiles_path}}
       {% raw %}DATACOVES__DBT_HOME: /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }}{% endraw%}/{{dbt_project_dir}}
 
       {% if 'snowflake' in dbt_adapter %}
diff --git a/{{ _copier_conf.answers_file }}.jinja b/{{ _copier_conf.answers_file }}.jinja
new file mode 100644
index 0000000..971b710
--- /dev/null
+++ b/{{ _copier_conf.answers_file }}.jinja	
@@ -0,0 +1,2 @@
+# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
+{{ _copier_answers|to_nice_yaml  }}