diff --git a/utils/Dockerfile-base-ci b/utils/Dockerfile-base-ci
index 5748443..afc225c 100644
--- a/utils/Dockerfile-base-ci
+++ b/utils/Dockerfile-base-ci
@@ -13,6 +13,5 @@ RUN pip3 install -U pip 'pipenv>=2020.6.2' setuptools wheel
 
 ENV POETRY_HOME "$HOME/.poetry"
 ENV POETRY_NO_INTERACTION 1
-RUN wget https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py && \
-    python3 get-poetry.py
+RUN wget -O - -o /dev/null https://install.python-poetry.org | python3 -
 ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"
diff --git a/utils/Dockerfile-ci b/utils/Dockerfile-ci
index 30bda57..d5541de 100644
--- a/utils/Dockerfile-ci
+++ b/utils/Dockerfile-ci
@@ -5,10 +5,9 @@ RUN apk update && \
     apk add python3 python3-dev build-base libffi-dev openssl-dev git bash rust cargo && \
     apk add yq --repository http://dl-3.alpinelinux.org/alpine/edge/community/
 RUN python3 -m ensurepip
-RUN pip3 install docker-compose
 
 ENV POETRY_HOME "$HOME/.poetry"
 ENV POETRY_NO_INTERACTION 1
-RUN wget https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py && \
-    python3 get-poetry.py
+
+RUN wget -O - -o /dev/null https://install.python-poetry.org | python3 -
 ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"
diff --git a/{{cookiecutter.repo_name}}/Dockerfile-django.production b/{{cookiecutter.repo_name}}/Dockerfile-django.production
index 2671347..92ed407 100644
--- a/{{cookiecutter.repo_name}}/Dockerfile-django.production
+++ b/{{cookiecutter.repo_name}}/Dockerfile-django.production
@@ -29,8 +29,7 @@ ENV POETRY_NO_INTERACTION 1
 ENV POETRY_VIRTUALENVS_CREATE 0
 ENV PATH="$POETRY_HOME/bin:$PATH"
 
-RUN wget https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py && \
-    python3 get-poetry.py
+RUN wget -O - -o /dev/null https://install.python-poetry.org | python3 -
 
 COPY pyproject.toml /
 COPY poetry.lock /
diff --git a/{{cookiecutter.repo_name}}/Dockerfile-django.production.debian b/{{cookiecutter.repo_name}}/Dockerfile-django.production.debian
index c5d0c38..0e30fd9 100644
--- a/{{cookiecutter.repo_name}}/Dockerfile-django.production.debian
+++ b/{{cookiecutter.repo_name}}/Dockerfile-django.production.debian
@@ -28,8 +28,7 @@ ENV POETRY_NO_INTERACTION 1
 ENV POETRY_VIRTUALENVS_CREATE 0
 ENV PATH="$POETRY_HOME/bin:$PATH"
 
-RUN wget https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py && \
-    python3 get-poetry.py
+RUN wget -O - -o /dev/null https://install.python-poetry.org | python3 -
 
 COPY pyproject.toml /
 COPY poetry.lock /
diff --git a/{{cookiecutter.repo_name}}/Makefile b/{{cookiecutter.repo_name}}/Makefile
index 8a49315..31442f0 100644
--- a/{{cookiecutter.repo_name}}/Makefile
+++ b/{{cookiecutter.repo_name}}/Makefile
@@ -19,8 +19,8 @@ PROJECT_ROOT ?= $(CURDIR)
 SITE_ROOT ?= $(PROJECT_ROOT)/$(PROJECT_NAME)
 
 CUR_DIR_NAME ?= $(shell basename `pwd`)
-DJANGO_IMAGE_NAME ?= $(CUR_DIR_NAME)_django
-POETRY_WRAPPER_IMAGE_NAME ?= $(PROJECT_NAME)_poetry_wrapper
+DJANGO_IMAGE_NAME ?= $(CUR_DIR_NAME)-django
+POETRY_WRAPPER_IMAGE_NAME ?= $(PROJECT_NAME)-poetry-wrapper
 
 # - {%- if cookiecutter.frontend_style == SPA %}
 JS_COBERTURA="app/coverage/cobertura-coverage.xml"