diff --git a/Dockerfile b/Dockerfile
index e3dbab04..fe188a30 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.7-slim-buster@sha256:2053d75b458798a56bfa84b0fb58e54938fcb3db236b26dbc0f5748d38dbba58
+FROM python:3.7-slim-buster@sha256:50de4af76270c893fe36a9ae428951057d6e1a681312d11861970baa150a62e2
 RUN apt update && apt install curl make git libopenblas-base -y
 RUN curl -sSL https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py | python
 ENV SHELL /bin/bash -l
diff --git a/release-script/Dockerfile_changelog b/release-script/Dockerfile_changelog
index e63c7671..30517bb4 100644
--- a/release-script/Dockerfile_changelog
+++ b/release-script/Dockerfile_changelog
@@ -1,7 +1,6 @@
-FROM node:10.16.0-alpine@sha256:07897ec27318d8e43cfc6b1762e7a28ed01479ba4927aca0cdff53c1de9ea6fd
+FROM node:lts-alpine@sha256:c785e617c8d7015190c0d41af52cc69be8a16e3d9eb7cb21f0bb58bcfca14d6b
 
 RUN apk add git
 
-RUN npm i -g conventional-changelog-cli
-RUN npm i -g conventional-github-releaser@3.1.3
+RUN npm i -g conventional-github-releaser@3.1.3 conventional-changelog-cli
 
diff --git a/release-script/prepare-release.sh b/release-script/prepare-release.sh
index 3686a2f2..afa93fda 100755
--- a/release-script/prepare-release.sh
+++ b/release-script/prepare-release.sh
@@ -28,11 +28,12 @@ git add pyproject.toml docs/
 git commit -m "chore: release v${version}"
 # Create tag for changelog generation
 git tag v${version}
-docker run -v ${PWD}:/work -w /work --entrypoint "" release-changelog:latest conventional-changelog -p angular -i CHANGELOG.md -s -r 0
-docker run -v ${PWD}:/work -w /work --entrypoint "" release-changelog:latest chmod 777 CHANGELOG.md
+docker run -v ${PWD}:/work -w /work --entrypoint "" release-changelog:latest git config --global --add safe.directory /work &&\
+ conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && \
+ chmod 777 CHANGELOG.md
 # Removing 4 first line of the file
 echo "$(tail -n +4 CHANGELOG.md)" > CHANGELOG.md
-# Deleting tag 
+# Deleting tag
 git tag -d v${version}
 # Adding CHANGELOG to commit
 git add CHANGELOG.md