diff --git a/Makefile b/Makefile
index 79d020d..65cc953 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ PYTHONPATH := `pwd`
 #* Poetry
 .PHONY: poetry-download
 poetry-download:
-	curl -sSL https://install.python-poetry.org | $(PYTHON) -
+	curl -sSL https://install.python-poetry.org | POETRY_VERSION=1.8.5 $(PYTHON) -
 
 .PHONY: poetry-remove
 poetry-remove:
@@ -17,7 +17,7 @@ poetry-remove:
 install:
 	poetry lock -n && poetry export --without-hashes > requirements.txt
 	poetry install -n
-	-poetry run mypy --install-types --non-interactive hooks tests
+	poetry run mypy --install-types --non-interactive hooks tests
 
 .PHONY: pre-commit-install
 pre-commit-install:
diff --git a/{{ cookiecutter.project_name.lower().replace(' ', '-') }}/.github/workflows/{{ cookiecutter.package_name }}.yml b/{{ cookiecutter.project_name.lower().replace(' ', '-') }}/.github/workflows/{{ cookiecutter.package_name }}.yml
index eef5ec8..b8ec2b1 100644
--- a/{{ cookiecutter.project_name.lower().replace(' ', '-') }}/.github/workflows/{{ cookiecutter.package_name }}.yml	
+++ b/{{ cookiecutter.project_name.lower().replace(' ', '-') }}/.github/workflows/{{ cookiecutter.package_name }}.yml	
@@ -23,7 +23,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.8.1
+          version: 1.8.5
           virtualenvs-create: true
           virtualenvs-in-project: true
           installer-parallel: true
@@ -59,7 +59,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.8.1
+          version: 1.8.5
           virtualenvs-create: true
           virtualenvs-in-project: true
           installer-parallel: true
diff --git a/{{ cookiecutter.project_name.lower().replace(' ', '-') }}/.gitlab-ci.yml b/{{ cookiecutter.project_name.lower().replace(' ', '-') }}/.gitlab-ci.yml
index 62caff3..c6d5b8a 100644
--- a/{{ cookiecutter.project_name.lower().replace(' ', '-') }}/.gitlab-ci.yml	
+++ b/{{ cookiecutter.project_name.lower().replace(' ', '-') }}/.gitlab-ci.yml	
@@ -18,7 +18,7 @@ stages:
 .install-deps-template: &install-deps
   image: python:{{ cookiecutter.python_version }}
   before_script:
-    - pip install poetry
+    - pip install poetry==1.8.5
     - poetry --version
     - poetry config virtualenvs.in-project true
     - poetry config installer.max-workers 10
diff --git a/{{ cookiecutter.project_name.lower().replace(' ', '-') }}/Dockerfile b/{{ cookiecutter.project_name.lower().replace(' ', '-') }}/Dockerfile
index b648025..e0f0933 100644
--- a/{{ cookiecutter.project_name.lower().replace(' ', '-') }}/Dockerfile	
+++ b/{{ cookiecutter.project_name.lower().replace(' ', '-') }}/Dockerfile	
@@ -4,7 +4,7 @@
 # PYTHON-BASE
 # Sets up all our shared environment variables
 ################################
-FROM python:{{ cookiecutter.python_version }}-slim as python-base
+FROM python:{{ cookiecutter.python_version }}-slim AS python-base
 
     # python
 ENV PYTHONUNBUFFERED=1 \
@@ -17,7 +17,7 @@ ENV PYTHONUNBUFFERED=1 \
     \
     # poetry
     # https://python-poetry.org/docs/configuration/#using-environment-variables
-    POETRY_VERSION=1.8.1 \
+    POETRY_VERSION=1.8.5 \
     # make poetry install to this location
     POETRY_HOME="/opt/poetry" \
     # make poetry create the virtual environment in the project's root
diff --git a/{{ cookiecutter.project_name.lower().replace(' ', '-') }}/Makefile b/{{ cookiecutter.project_name.lower().replace(' ', '-') }}/Makefile
index 5c3f0d1..d6559b7 100644
--- a/{{ cookiecutter.project_name.lower().replace(' ', '-') }}/Makefile	
+++ b/{{ cookiecutter.project_name.lower().replace(' ', '-') }}/Makefile	
@@ -13,7 +13,7 @@ TESTS = tests
 #* Poetry
 .PHONY: poetry-download
 poetry-download:
-	curl -sSL https://install.python-poetry.org | $(PYTHON) -
+	POETRY_VERSION=1.8.5 curl -sSL https://install.python-poetry.org | $(PYTHON) -
 
 .PHONY: poetry-remove
 poetry-remove: