diff --git a/Dockerfile b/Dockerfile
index f79fa30..175fc66 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,13 +13,14 @@ ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
 ENV NODE_ENV production
 ENV ACCEPT_HIGHCHARTS_LICENSE="YES"
 
-RUN npm i -g highcharts-export-server@latest
+RUN npm i -g @cubetiq/highcharts-export-server@latest
 
 WORKDIR /usr/share/fonts/truetype
 ADD fonts/* ./
 RUN fc-cache -fv
 
 WORKDIR /
+ADD entrypoint.sh /entrypoint.sh
 
-EXPOSE 8080
-ENTRYPOINT ["highcharts-export-server", "--enableServer", "1", "--port", "8080"]
\ No newline at end of file
+EXPOSE ${PORT:-8080}
+ENTRYPOINT ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/Dockerfile.arm b/Dockerfile.arm
index a72efae..3e6b5f4 100644
--- a/Dockerfile.arm
+++ b/Dockerfile.arm
@@ -7,13 +7,14 @@ ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
 ENV NODE_ENV production
 ENV ACCEPT_HIGHCHARTS_LICENSE="YES"
 
-RUN npm i -g highcharts-export-server@latest
+RUN npm i -g @cubetiq/highcharts-export-server@latest
 
 WORKDIR /usr/share/fonts/truetype
 ADD fonts/* ./
 RUN fc-cache -fv
 
 WORKDIR /
+ADD entrypoint.sh /entrypoint.sh
 
-EXPOSE 8080
-ENTRYPOINT ["highcharts-export-server", "--enableServer", "1", "--port", "8080"]
\ No newline at end of file
+EXPOSE ${PORT:-8080}
+ENTRYPOINT ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 69990b7..4e79cd5 100644
--- a/Makefile
+++ b/Makefile
@@ -11,4 +11,8 @@ build:
 	@echo 'Starting docker buildx push'
 	docker buildx build --platform linux/arm64,linux/arm/v7 -f Dockerfile.arm -t ${DOCKER_IMAGE_ARM} --push .
 
+run-test:
+	@echo 'Starting docker run'
+	docker run --rm -e PORT=5000 -e HIGHCHARTS_NO_LOGO=true -e HIGHCHARTS_UI_ENABLE=true -e HIGHCHARTS_UI_ROUTE=/ui --name hc-server -p 8080:5000 ${DOCKER_IMAGE}
+	
 .PHONY:build
\ No newline at end of file
diff --git a/entrypoint.sh b/entrypoint.sh
new file mode 100755
index 0000000..5cdb99e
--- /dev/null
+++ b/entrypoint.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+PORT=${PORT:-8080}
+HIGHCHARTS_LOG_LEVEL=${HIGHCHARTS_LOG_LEVEL:-1}
+
+highcharts-export-server --enableServer 1 --port $PORT --logLevel $HIGHCHARTS_LOG_LEVEL