diff --git a/README.md b/README.md
index c7cee43..3d82720 100644
--- a/README.md
+++ b/README.md
@@ -148,9 +148,10 @@ will come up with a better solution for this soon.
 
 ## Known issues and limitations
 
-- This add-on currently only supports AMD64 machines, although we hope
-  we are able to support ARM devices in the future, it is most likely that
-  most devices will lack the resources to run this add-on (e.g., Raspberry Pi).
+- This add-on currently only supports AMD64 and aarch64/ARM64 machines.
+  Although we support ARM devices, please be aware, that this add-on is quite
+  heavy to run, and requires quite a bit of RAM. We do not recommended to run
+  it on devices with less than 4Gb of memory.
 - If you get a blank screen (and it worked before), it could be that you changed
   your workspace. Reinstalling the add-on will not help since it keeps the data
   in your browser. To remove it (in Chrome) open up developer tools (F12),
@@ -244,7 +245,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
-[aarch64-shield]: https://img.shields.io/badge/aarch64-no-red.svg
+[aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg
 [armv7-shield]: https://img.shields.io/badge/armv7-no-red.svg
diff --git a/vscode/Dockerfile b/vscode/Dockerfile
index c0bf789..6ed9f42 100755
--- a/vscode/Dockerfile
+++ b/vscode/Dockerfile
@@ -17,7 +17,7 @@ COPY requirements.txt /tmp/requirements.txt
 COPY vscode.extensions /root/vscode.extensions
 
 # Setup base system
-ARG BUILD_ARCH
+ARG BUILD_ARCH=amd64
 RUN \
     apt-get update \
     \
@@ -43,8 +43,10 @@ RUN \
     \
     && locale-gen en_US.UTF-8 \
     \
+    && if [[ "${BUILD_ARCH}" = "aarch64" ]]; then ARCH="arm64"; fi \
+    && if [[ "${BUILD_ARCH}" = "amd64" ]]; then ARCH="x86_64"; fi \
     && curl -J -L -o /tmp/code.tar.gz \
-        "https://github.com/cdr/code-server/releases/download/2.1698/code-server2.1698-vsc1.41.1-linux-x86_64.tar.gz" \
+        "https://github.com/cdr/code-server/releases/download/2.1698/code-server2.1698-vsc1.41.1-linux-${ARCH}.tar.gz" \
     && tar zxvf \
         /tmp/code.tar.gz \
         --strip 1 -C /tmp \
@@ -110,9 +112,6 @@ RUN \
 # Copy root filesystem
 COPY rootfs /
 
-# Get the custom extensions
-COPY --from=vscode /root/.vscode/extensions /root/.code-server/extensions
-
 # Build arguments
 ARG BUILD_DATE
 ARG BUILD_REF
diff --git a/vscode/config.json b/vscode/config.json
index b10d926..e1c563a 100755
--- a/vscode/config.json
+++ b/vscode/config.json
@@ -8,7 +8,7 @@
   "ingress_port": 1337,
   "panel_icon": "mdi:visual-studio-code",
   "startup": "services",
-  "arch": ["amd64"],
+  "arch": ["aarch64", "amd64"],
   "boot": "auto",
   "hassio_api": true,
   "hassio_role": "manager",