diff --git a/DOCKER_README.md b/DOCKER_README.md
index eadaf4061..93a5d9e44 100644
--- a/DOCKER_README.md
+++ b/DOCKER_README.md
@@ -8,7 +8,7 @@ More information on how to use the helm unittest plugin see https://github.com/h
 
 The latest docker tag is the latest helm release (https://github.com/helm/helm/releases/latest) containing the latest helm unittest plugin (https://github.com/helm-unittest/helm-unittest/releases/latest)
 
-Please be aware to use the latest tag, as it can change the helm client and the helm unittest plugin version. Tag with the right versions is the proper way, such as ``` helm-unittest/helm-unittest:3.10.0-1.0.0 ```
+Please be aware to use the latest tag, as it can change the helm client and the helm unittest plugin version. Tag with the right versions is the proper way, such as ``` helmunittest/helm-unittest:3.11.1-0.3.0 ```
 
 ## Github Repo ##
 
@@ -17,25 +17,25 @@ https://github.com/helm-unittest/helm-unittest/ </br>
 
 ## Docker image tags ##
 
-https://hub.docker.com/r/helm-unittest/helm-unittest/tags/ </br>
+https://hub.docker.com/r/helmunittest/helm-unittest/tags/ </br>
 *Overview of the available version combinations*
 
 # Usage #
 ``` 
 # run help of latest helm with latest helm unittest plugin
-docker run -ti --rm -v $(pwd):/apps helm-unittest/helm-unittest .
+docker run -ti --rm -v $(pwd):/apps helmunittest/helm-unittest .
 
 # run help of specific helm version with specific helm unittest plugin version
-docker run -ti --rm -v $(pwd):/apps helm-unittest/helm-unittest:3.10.0-1.0.0 .
+docker run -ti --rm -v $(pwd):/apps helmunittest/helm-unittest:3.11.1-0.3.0 .
 
 # run unittests of a helm 3 chart
 # make sure to mount local folder to /apps in container
-docker run -ti --rm -v $(pwd):/apps helm-unittest/helm-unittest:3.10.0-1.0.0 .
+docker run -ti --rm -v $(pwd):/apps helmunittest/helm-unittest:3.11.1-0.3.0 .
 
 # run unittests of a helm 3 chart with Junit output for CI validation
 # make sure to mount local folder to /apps in container
 # the test-output.xml will be available in the local folder.
-docker run -ti --rm -v $(pwd):/apps helm-unittest/helm-unittest:3.10.0-1.0.0 -o test-output.xml .
+docker run -ti --rm -v $(pwd):/apps helmunittest/helm-unittest:3.11.1-0.3.0 -o test-output.xml .
 ```
 *More information on how to use the helm unittest plugin see https://github.com/helm-unittest/helm-unittest/blob/main/DOCUMENT.md*
 
diff --git a/Makefile b/Makefile
index 39c2c32f2..6a867c459 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ HELM_PLUGIN_DIR := $(HELM_3_PLUGINS)/helm-unittest
 VERSION := $(shell sed -n -e 's/version:[ "]*\([^"]*\).*/\1/p' plugin.yaml)
 DIST := ./_dist
 LDFLAGS := "-X main.version=${VERSION} -extldflags '-static'"
-DOCKER ?= "quintush/helm-unittest"
+DOCKER ?= "helmunittest/helm-unittest"
 
 .PHONY: install
 install: bootstrap build
diff --git a/README.md b/README.md
index 58795029d..c332f6d2d 100644
--- a/README.md
+++ b/README.md
@@ -47,19 +47,19 @@ It will install the latest version of binary into helm plugin directory.
 
 ``` 
 # run help of latest helm with latest helm unittest plugin
-docker run -ti --rm -v $(pwd):/apps quintush/helm-unittest
+docker run -ti --rm -v $(pwd):/apps helmunittest/helm-unittest
 
 # run help of specific helm version with specific helm unittest plugin version
-docker run -ti --rm -v $(pwd):/apps quintush/helm-unittest:3.10.0-1.0.0
+docker run -ti --rm -v $(pwd):/apps helmunittest/helm-unittest:3.11.1-0.3.0
 
 # run unittests of a helm 3 chart
 # make sure to mount local folder to /apps in container
-docker run -ti --rm -v $(pwd):/apps quintush/helm-unittest:3.10.0-1.0.0 .
+docker run -ti --rm -v $(pwd):/apps helmunittest/helm-unittest:3.11.1-0.3.0 .
 
 # run unittests of a helm 3 chart with Junit output for CI validation
 # make sure to mount local folder to /apps in container
 # the test-output.xml will be available in the local folder.
-docker run -ti --rm -v $(pwd):/apps quintush/helm-unittest:3.10.0-1.0.0 -o test-output.xml -t junit .
+docker run -ti --rm -v $(pwd):/apps helmunittest/helm-unittest:3.11.1-0.3.0 -o test-output.xml -t junit .
 ```
 
 The docker container contains the fully installed helm client, including the helm-unittest plugin.
diff --git a/docker-build.sh b/docker-build.sh
index eec5c6139..efb900efd 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -6,7 +6,7 @@
 # DOCKER_PASSWORD
 # GITHUB_TOKEN
 
-# set -ex
+set -ex
 
 build() {
 
@@ -35,7 +35,7 @@ build() {
   fi
 }
 
-image="quintush/helm-unittest"
+image="helmunittest/helm-unittest"
 helmRepo="helm/helm"
 pluginRepo="helm-unittest/helm-unittest"