diff --git a/Dockerfile b/Dockerfile
index 58dbee9..7e5c147 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,36 @@
 FROM debian:stable-slim
 
-RUN apt-get update && \
+ARG VERSION=12.3.1-1.1
+
+RUN ARCH="$(dpkg --print-architecture)" && \
+    case $ARCH in \
+    "amd64") \
+        ARCH_TAG="x64" \
+        ;; \
+    "arm64") \
+        ARCH_TAG="arm64" \
+        ;; \
+    esac && \
+    # Get nessecary packages
+    apt-get update && \
     apt-get install \
     --no-install-recommends \
-    gcc-arm-none-eabi \
-    libstdc++-arm-none-eabi-newlib \
     make \
     cmake \
+    wget \
+    ca-certificates \
     -y && \
-    rm -rf /var/cache/apt
-
+    rm -rf /var/cache/apt && \
+    mkdir /workdir && \
+    cd /workdir && \
+    wget https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v${VERSION}/xpack-arm-none-eabi-gcc-${VERSION}-linux-${ARCH_TAG}.tar.gz && \
+    tar xvf xpack-arm-none-eabi-gcc-${VERSION}-linux-${ARCH_TAG}.tar.gz && \
+    rm xpack-arm-none-eabi-gcc-${VERSION}-linux-${ARCH_TAG}.tar.gz
     
+RUN echo 'export PATH="/workdir/xpack-arm-none-eabi-gcc-'${VERSION}'/bin:$PATH"' >> /etc/bashrc
 
+ADD entrypoint.sh /entrypoint.sh
+
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT [ "/entrypoint.sh" ]
diff --git a/README.md b/README.md
index 72e59dc..25a27ef 100644
--- a/README.md
+++ b/README.md
@@ -14,8 +14,14 @@ jobs:
       - uses: actions/checkout@v3
         
       - name: make   
-        uses: embedd-actions/arm-gcc-ci@v1 
+        uses: embedd-actions/arm-gcc-ci@v12.3.1 
         with: 
           command: make --directory Release all
 
 ```
+
+## List of available tags
+
+```
+v12.3.1
+```
diff --git a/action.yml b/action.yml
index 4f4b978..107641b 100644
--- a/action.yml
+++ b/action.yml
@@ -1,5 +1,8 @@
 name: 'ARM GCC build'
-description: 'Building arm projects'
+description: 'Building arm-gcc projects'
+branding:
+  color: blue
+  icon: microchip
 inputs:
    command:
      description: 'Command'
@@ -7,9 +10,7 @@ inputs:
      default: arm-none-eabi-gcc --version
 runs:
   using: 'docker'
-  image: 'docker://sergeyladanov/arm-gcc:v1'
+  image: 'docker://sergeyladanov/arm-gcc:v12.3.1'
   args:
-    - /bin/sh
-    - -c
-    - ${{ inputs.command }}
+     - ${{ inputs.command }}
  
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..00965df
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,10 @@
+version: '2'
+
+services:
+  arm-gcc:
+    container_name: arm-gcc
+    build:
+      context: .
+      dockerfile: Dockerfile
+      args:
+        - VERSION=12.3.1-1.1
\ No newline at end of file
diff --git a/entrypoint.sh b/entrypoint.sh
new file mode 100644
index 0000000..9d48d31
--- /dev/null
+++ b/entrypoint.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+ . /etc/bashrc
+
+exec $@