diff --git a/{{ cookiecutter.__package_name_kebab_case }}/docker-compose.yml b/{{ cookiecutter.__package_name_kebab_case }}/docker-compose.yml
index 38157902..435f0e00 100644
--- a/{{ cookiecutter.__package_name_kebab_case }}/docker-compose.yml	
+++ b/{{ cookiecutter.__package_name_kebab_case }}/docker-compose.yml	
@@ -16,8 +16,10 @@ services:
         GID: ${GID:-1000}
     {%- if not cookiecutter.private_package_repository_name %}
     environment:
-      - POETRY_PYPI_TOKEN_PYPI
+      {%- if cookiecutter.development_environment == "strict" %}
       - CI
+      {%- endif %}
+      - POETRY_PYPI_TOKEN_PYPI
     {%- else %}
     secrets:
       - poetry-auth
diff --git a/{{ cookiecutter.__package_name_kebab_case }}/pyproject.toml b/{{ cookiecutter.__package_name_kebab_case }}/pyproject.toml
index 84427d30..30d1bd04 100644
--- a/{{ cookiecutter.__package_name_kebab_case }}/pyproject.toml	
+++ b/{{ cookiecutter.__package_name_kebab_case }}/pyproject.toml	
@@ -275,11 +275,7 @@ convention = "{{ cookiecutter.docstring_style|lower }}"
 
     [[tool.poe.tasks.lint.sequence]]
     shell = """
-{%- if cookiecutter.development_environment == "strict" %}
-      if [ -n "$CI" ]; then
-        export SKIP=no-commit-to-branch
-      fi
-{%- endif %}
+      {%- if cookiecutter.development_environment == "strict" %}[ -n "$CI" ] && export SKIP=no-commit-to-branch{%- endif %}
       pre-commit run --all-files --color always
       """
 {%- if cookiecutter.development_environment == "strict" %}