diff --git a/.dockerignore b/.dockerignore
index d95ee5e..3e1755c 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,5 @@
 .DS_Store
 
-fonts/Kh-Bokor.ttf
 fonts/LICENSE.txt
 fonts/METADATA.pb
 
@@ -9,5 +8,8 @@ scripts
 exported.png
 LICENSE
 README.md
+Dockerfile*
+Makefile
+.gitignore
 
-.github
\ No newline at end of file
+.github/
\ No newline at end of file
diff --git a/.github/workflows/docker-private.yml b/.github/workflows/docker-private.yml
index f4253d2..fbef092 100644
--- a/.github/workflows/docker-private.yml
+++ b/.github/workflows/docker-private.yml
@@ -3,7 +3,7 @@ name: Docker CI Private
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   build:
@@ -16,4 +16,4 @@ jobs:
       - name: Sign-in to Private Registry "${REGISTRY}"
         run: docker login $REGISTRY -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
       - name: Building Docker Image
-        run: /bin/bash scripts/build.sh
+        run: /bin/bash scripts/build.sh scripts/build-arm.sh
diff --git a/.github/workflows/docker-public.yml b/.github/workflows/docker-public.yml
index fe54301..ffcf91e 100644
--- a/.github/workflows/docker-public.yml
+++ b/.github/workflows/docker-public.yml
@@ -3,7 +3,7 @@ name: Docker CI Public
 on:
   push:
     branches:
-      - 'master'
+      - 'main'
 
 jobs:
   docker:
diff --git a/Dockerfile b/Dockerfile
index ed11915..3b8647b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,11 @@
-FROM node:14.16.0
+FROM node:alpine
 LABEL maintainer="sombochea@cubetiqs.com"
 
 ENV ACCEPT_HIGHCHARTS_LICENSE="YES"
-RUN yarn global add highcharts-export-server
+RUN npm i -g highcharts-export-server@latest
 
 WORKDIR /usr/share/fonts/truetype
-ADD fonts/OpenSans-Regular.ttf OpenSans-Regular.ttf
-ADD fonts/OpenSans-Light.ttf OpenSans-Light.ttf
-ADD fonts/OpenSans-Semibold.ttf OpenSans-Semibold.ttf
-ADD fonts/OpenSans-Bold.ttf OpenSans-Bold.ttf
-ADD fonts/OpenSans-ExtraBold.ttf OpenSans-ExtraBold.ttf
-ADD fonts/OpenSans-Italic.ttf OpenSans-Italic.ttf
-ADD fonts/OpenSans-LightItalic.ttf OpenSans-LightItalic.ttf
-ADD fonts/OpenSans-BoldItalic.ttf OpenSans-BoldItalic.ttf
-ADD fonts/OpenSans-SemiboldItalic.ttf OpenSans-SemiboldItalic.ttf
-ADD fonts/OpenSans-ExtraBoldItalic.ttf OpenSans-ExtraBoldItalic.ttf
-
-ADD fonts/Kh-Content.ttf Kh-Content.ttf
-ADD fonts/Kh-Siemreap.ttf Kh-Siemreap.ttf
+ADD fonts/* ./
 
 WORKDIR /
 
diff --git a/Dockerfile.arm b/Dockerfile.arm
new file mode 100644
index 0000000..819a0e0
--- /dev/null
+++ b/Dockerfile.arm
@@ -0,0 +1,13 @@
+FROM --platform=linux/arm64 node:alpine
+LABEL maintainer="sombochea@cubetiqs.com"
+
+ENV ACCEPT_HIGHCHARTS_LICENSE="YES"
+RUN npm i -g highcharts-export-server@latest
+
+WORKDIR /usr/share/fonts/truetype
+ADD fonts/* ./
+
+WORKDIR /
+
+EXPOSE 8080
+ENTRYPOINT ["highcharts-export-server", "--enableServer", "1", "--port", "8080"]
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 2520545..69990b7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
-DOCKER_IMAGE=cubetiq/highcharts-export-server
+DOCKER_IMAGE=cubetiq/highcharts-export-server:latest
+DOCKER_IMAGE_ARM=cubetiq/highcharts-export-server:arm
 
 build:
 	@echo 'Starting docker build'
@@ -7,4 +8,7 @@ build:
 	@echo 'Starting docker push'
 	docker push ${DOCKER_IMAGE}
 
+	@echo 'Starting docker buildx push'
+	docker buildx build --platform linux/arm64,linux/arm/v7 -f Dockerfile.arm -t ${DOCKER_IMAGE_ARM} --push .
+
 .PHONY:build
\ No newline at end of file
diff --git a/fonts/KantumruyPro-Bold.ttf b/fonts/KantumruyPro-Bold.ttf
new file mode 100644
index 0000000..20b2351
Binary files /dev/null and b/fonts/KantumruyPro-Bold.ttf differ
diff --git a/fonts/KantumruyPro-BoldItalic.ttf b/fonts/KantumruyPro-BoldItalic.ttf
new file mode 100644
index 0000000..96151de
Binary files /dev/null and b/fonts/KantumruyPro-BoldItalic.ttf differ
diff --git a/fonts/KantumruyPro-ExtraLight.ttf b/fonts/KantumruyPro-ExtraLight.ttf
new file mode 100644
index 0000000..affcbfd
Binary files /dev/null and b/fonts/KantumruyPro-ExtraLight.ttf differ
diff --git a/fonts/KantumruyPro-ExtraLightItalic.ttf b/fonts/KantumruyPro-ExtraLightItalic.ttf
new file mode 100644
index 0000000..f7cb1ab
Binary files /dev/null and b/fonts/KantumruyPro-ExtraLightItalic.ttf differ
diff --git a/fonts/KantumruyPro-Italic.ttf b/fonts/KantumruyPro-Italic.ttf
new file mode 100644
index 0000000..af59946
Binary files /dev/null and b/fonts/KantumruyPro-Italic.ttf differ
diff --git a/fonts/KantumruyPro-Light.ttf b/fonts/KantumruyPro-Light.ttf
new file mode 100644
index 0000000..ca3418e
Binary files /dev/null and b/fonts/KantumruyPro-Light.ttf differ
diff --git a/fonts/KantumruyPro-LightItalic.ttf b/fonts/KantumruyPro-LightItalic.ttf
new file mode 100644
index 0000000..7535c61
Binary files /dev/null and b/fonts/KantumruyPro-LightItalic.ttf differ
diff --git a/fonts/KantumruyPro-Medium.ttf b/fonts/KantumruyPro-Medium.ttf
new file mode 100644
index 0000000..0aee693
Binary files /dev/null and b/fonts/KantumruyPro-Medium.ttf differ
diff --git a/fonts/KantumruyPro-MediumItalic.ttf b/fonts/KantumruyPro-MediumItalic.ttf
new file mode 100644
index 0000000..29dede8
Binary files /dev/null and b/fonts/KantumruyPro-MediumItalic.ttf differ
diff --git a/fonts/KantumruyPro-Regular.ttf b/fonts/KantumruyPro-Regular.ttf
new file mode 100644
index 0000000..9f1cff9
Binary files /dev/null and b/fonts/KantumruyPro-Regular.ttf differ
diff --git a/fonts/KantumruyPro-SemiBold.ttf b/fonts/KantumruyPro-SemiBold.ttf
new file mode 100644
index 0000000..326e613
Binary files /dev/null and b/fonts/KantumruyPro-SemiBold.ttf differ
diff --git a/fonts/KantumruyPro-SemiBoldItalic.ttf b/fonts/KantumruyPro-SemiBoldItalic.ttf
new file mode 100644
index 0000000..61e6699
Binary files /dev/null and b/fonts/KantumruyPro-SemiBoldItalic.ttf differ
diff --git a/fonts/KantumruyPro-Thin.ttf b/fonts/KantumruyPro-Thin.ttf
new file mode 100644
index 0000000..7507478
Binary files /dev/null and b/fonts/KantumruyPro-Thin.ttf differ
diff --git a/fonts/KantumruyPro-ThinItalic.ttf b/fonts/KantumruyPro-ThinItalic.ttf
new file mode 100644
index 0000000..6c906e3
Binary files /dev/null and b/fonts/KantumruyPro-ThinItalic.ttf differ
diff --git a/scripts/build-arm.sh b/scripts/build-arm.sh
new file mode 100755
index 0000000..39d1654
--- /dev/null
+++ b/scripts/build-arm.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+TAG=arm
+REGISTRY=registry1.ctdn.net/cubetiq
+IMAGE=highcharts-export-server
+CONTAINER=${REGISTRY}/${IMAGE}:${TAG}
+
+echo "Building container image with ${CONTAINER} for arm platform"
+docker buildx build --platform linux/arm64 -f Dockerfile.arm -t ${CONTAINER} --push .
\ No newline at end of file
diff --git a/scripts/build.sh b/scripts/build.sh
index 4f135d3..e23864c 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 TAG=latest
-REGISTRY=registry.kh.cubetiqs.com
+REGISTRY=registry1.ctdn.net/cubetiq
 IMAGE=highcharts-export-server
 CONTAINER=${REGISTRY}/${IMAGE}:${TAG}
 
diff --git a/scripts/run.sh b/scripts/run.sh
index 105edeb..ecd0d20 100755
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -7,4 +7,4 @@ echo "Run the container..."
 docker run --name highcharts-export-server \
     -p 8080:8080 \
     --restart always \
-    -d registry.kh.cubetiqs.com/highcharts-export-server
\ No newline at end of file
+    -d registry1.ctdn.net/cubetiq/highcharts-export-server
\ No newline at end of file