diff --git a/.circleci/config.yml b/.circleci/config.yml
index ebd40317..34752fb0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,30 +3,94 @@ version: 2.1
 orbs:
   win: circleci/windows@2.4.0 # The Windows orb give you everything you need to start using the Windows executor.
 
-jobs:
+commands:
   linux_build:
-    machine: 
-      image: ubuntu-1604:201903-01 # the primary container, where your job's commands are run
-    resource_class: large
+    parameters:
+      arch:
+        default: "x64"
+        type: string
     steps:
       - checkout
-      - run: docker --version
-      - run: docker pull jonmmease/kaleido-builder:0.7
-      - run: ./repos/linux_full_scripts/build_kaleido
+      - attach_workspace:
+          at: ./repos
+      #- run: docker pull jonmmease/chomium-builder:0.8
+      - run: ./repos/linux_scripts/build_kaleido <<parameters.arch>>
       - run: sudo chmod -R 777 repos/build
       - run: sudo chmod -R 777 repos/kaleido/py
       - run: ls repos/build/kaleido
-      - run: pushd repos/build && zip -r kaleido_linux.zip ./*
+      - run: pushd repos/build && zip -r kaleido_linux_<<parameters.arch>>.zip ./*
       - run: pushd repos/kaleido/py/ && zip -r kaleido_wheel.zip ./dist
       - store_artifacts:
-          path: ./repos/build/kaleido_linux.zip
+          path: ./repos/build/kaleido_linux_<<parameters.arch>>.zip
       - store_artifacts:
           path: ./repos/kaleido/py/kaleido_wheel.zip
       - persist_to_workspace:
           root: ./repos
           paths:
             - kaleido/py/
+  
+  windows_build:
+    parameters:
+      arch:
+        default: "x64"
+        type: string
+    steps:
+      - checkout
+      - run:
+          name: Update PowerShell.Archive to fix slash direction
+          command: Install-Module Microsoft.PowerShell.Archive -MinimumVersion 1.2.3.0 -Repository PSGallery -Force
+      - attach_workspace:
+          at: .\repos
+      - run: .\repos\win_scripts\build_kaleido.ps1 <<parameters.arch>>
+      - run: dir .\repos\build\kaleido
+      - run: dir .\repos\kaleido\py\dist
+      - store_artifacts:
+          path: ./repos/build/kaleido_win_<<parameters.arch>>.zip
+      - store_artifacts:
+          path: ./repos/kaleido/py/kaleido_wheel.zip
+
+jobs:
+  linux_fetch:
+    machine: 
+      image: ubuntu-1604:201903-01 # the primary container, where your job's commands are run
+    resource_class: large
+    steps:
+      - checkout
+      - run: docker pull jonmmease/chromium-builder:0.8
+      - run:
+          name: Fetch detpot_tools and chromium source tree
+          command: ./repos/linux_scripts/fetch_chromium
+          no_output_timeout: 30m
+      - run:
+          name: Delete .git directories to save space (skipping angle taken from electron circleci build)
+          command: |
+            cd ./repos/src
+            sudo rm -rf .git
+      - run:
+          name: Open permissions of fetched src directory
+          command: |
+            sudo chmod -R 777 ./repos/src
+      - persist_to_workspace:
+          root: ./repos
+          paths:
+            - src
             
+  linux_build_x64:
+    machine: 
+      image: ubuntu-1604:201903-01 # the primary container, where your job's commands are run
+    resource_class: xlarge
+    steps:
+      - linux_build:
+          arch: "x64"
+
+  linux_build_arm64:
+    machine: 
+      image: ubuntu-1604:201903-01 # the primary container, where your job's commands are run
+    resource_class: xlarge
+    steps:
+      - linux_build:
+          arch: "arm64"
+
   linux_test_37:
     docker:
       - image: continuumio/miniconda3
@@ -157,57 +221,36 @@ jobs:
             - .gclient_entries
             - kaleido/version
 
-  windows_build:
+  windows_build_x64:
     executor:
       name: win/default
       size: "xlarge"
       shell: powershell.exe
     steps:
-      - checkout
-      - run:
-          name: Update PowerShell.Archive to fix slash direction
-          command: Install-Module Microsoft.PowerShell.Archive -MinimumVersion 1.2.3.0 -Repository PSGallery -Force
-      - attach_workspace:
-          at: .\repos
-      - run: .\repos\win_scripts\build_kaleido.ps1 x64
-      - run: dir .\repos\build\kaleido
-      - run: dir .\repos\kaleido\py\dist
-      - store_artifacts:
-          path: ./repos/build/kaleido_win.zip
-      - store_artifacts:
-          path: ./repos/kaleido/py/kaleido_wheel.zip
+      - windows_build:
+          arch: "x64"
 
-  windows_build-32:
+  windows_build_x86:
     executor:
       name: win/default
       size: "xlarge"
       shell: powershell.exe
     steps:
-      - checkout
-      - run:
-          name: Update PowerShell.Archive to fix slash direction
-          command: Install-Module Microsoft.PowerShell.Archive -MinimumVersion 1.2.3.0 -Repository PSGallery -Force
-      - attach_workspace:
-          at: .\repos
-      - run: .\repos\win_scripts\build_kaleido.ps1 x86
-      - run: dir .\repos\build\kaleido
-      - run: dir .\repos\kaleido\py\dist
-      - store_artifacts:
-          path: ./repos/build/kaleido_win.zip
-      - store_artifacts:
-          path: ./repos/kaleido/py/kaleido_wheel.zip
+      - windows_build:
+          arch: "x86"
 
 workflows:
-  build-windows:
+  build-windows-x64:
     jobs:
       - windows_fetch
-      - windows_build:
+      - windows_build_x64:
           requires:
             - windows_fetch
-  build-windows-32:
+
+  build-windows-x86:
     jobs:
       - windows_fetch
-      - windows_build-32:
+      - windows_build_x86:
           requires:
             - windows_fetch
   build-mac:
@@ -220,13 +263,22 @@ workflows:
           requires:
             - mac_build_blink
 
-  build-linux:
+  build-linux-x64:
     jobs:
-      - linux_build
+      - linux_fetch
+      - linux_build_x64:
+          requires:
+            - linux_fetch
       - linux_test_37:
           requires:
-            - linux_build
+            - linux_build_x64
       - linux_test_27:
           requires:
-            - linux_build
+            - linux_build_x64
 
+  build-linux-arm64:
+    jobs:
+      - linux_fetch
+      - linux_build_arm64:
+          requires:
+            - linux_fetch
diff --git a/.dockerignore b/.dockerignore
index 1d8d9c3f..f8b9e8e8 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1 +1,2 @@
- repos/
+repos
+!repos/linux_scripts/
diff --git a/README.md b/README.md
index ef30946d..13b7e627 100644
--- a/README.md
+++ b/README.md
@@ -94,26 +94,10 @@ $ cd Kaleido
 ## Linux
 There are two approaches to building Kaleido on Linux, both of which rely on Docker.
 
-## Method 1
-This approach relies on the `jonmmease/kaleido-builder` docker image, and the scripts in `repos/linux_full_scripts`, to compile Kaleido.  This docker image is over 30GB, but in includes a precompiled instance of the Chromium source tree making it possible to compile Kaleido in just a few 10s of seconds. The downside of this approach is that the chromium source tree is not visible outside of the docker image so it may be difficult for development environments to index it. This is the approach used for Continuous Integration on Linux.
-
+The Linux build relies on the `jonmmease/chromium-builder` docker image, and the scripts in `repos/linux_scripts`, to download the chromium source to a local folder and then build it.
 Download docker image
 ```
-$ docker pull jonmmease/kaleido-builder:0.7
-```
-
-Build Kaleido
-
-```
-$ /repos/linux_full_scripts/build_kaleido
-```
-
-### Method 2
-This approach relies on the `jonmmease/chromium-builder` docker image, and the scripts in `repos/linux_scripts`, to download the chromium source to a local folder and then build it.  This takes longer to get set up than method 2 because the Chromium source tree must be compiled from scratch, but it downloads a copy of the chromium source tree to `repos/src` which makes it possible for development environments like CLion to index the Chromium codebase to provide code completion.
-
-Download docker image
-```
-$ docker pull jonmmease/chromium-builder:0.7
+$ docker pull jonmmease/chromium-builder:0.8
 ```
 
 Fetch the Chromium codebase and checkout the specific tag, then sync all dependencies
@@ -126,7 +110,13 @@ Then build the `kaleido` application to `repos/build/kaleido`, and bundle shared
 create the Python wheel under `repos/kaleido/py/dist/`
 
 ```
-$ /repos/linux_scripts/build_kaleido
+$ /repos/linux_scripts/build_kaleido x64
+```
+
+The above command will build Kaleido for the 64-bit Intel architecture. Kaleido can also be build for 64-bit ARM architecture with
+
+```
+$ /repos/linux_scripts/build_kaleido arm64
 ```
 
 ## MacOS
@@ -155,7 +145,12 @@ $ /repos/win_scripts/fetch_chromium.ps1
 
 Then build Kaleido to `repos/build/kaleido`. The build step will also create the Python wheel under `repos/kaleido/py/dist/`
 ```
-$ /repos/mac_scripts/build_kaleido.ps1
+$ /repos/mac_scripts/build_kaleido.ps1 x64
+```
+
+The above commnad will generate a 64-bit build. A 32-bit build can be generated using 
+```
+$ /repos/mac_scripts/build_kaleido.ps1 x86
 ```
 
 # Building Docker containers
@@ -165,14 +160,14 @@ The `chromium-builder` container mostly follows the instructions at https://chro
 Build container with:
 
 ```
-$ docker build -t jonmmease/chromium-builder:0.7 -f repos/linux_scripts/Dockerfile .
+$ docker build -t jonmmease/chromium-builder:0.8 -f repos/linux_scripts/Dockerfile .
 ```
 
 ## kaleido-builder
 This container contains a pre-compiled version of chromium source tree. Takes several hours to build!
 
 ```
-$ docker build -t jonmmease/kaleido-builder:0.7 -f repos/linux_full_scripts/Dockerfile .
+$ docker build -t jonmmease/kaleido-builder:0.8 -f repos/linux_full_scripts/Dockerfile .
 ```
 
 
diff --git a/repos/kaleido/py/setup.py b/repos/kaleido/py/setup.py
index 95eced3b..6123fd9d 100644
--- a/repos/kaleido/py/setup.py
+++ b/repos/kaleido/py/setup.py
@@ -127,7 +127,7 @@ def run(self):
         cmd_obj = self.distribution.get_command_obj('bdist_wheel')
 
         # Use current platform as plat_name, but replace linux with manylinux2014
-        cmd_obj.plat_name = distutils.util.get_platform().replace("linux-", "manylinux1-")
+        cmd_obj.plat_name = distutils.util.get_platform()
 
         # Handle windows 32-bit cross compilation
         print(os.environ.get("KALEIDO_ARCH", "x64"))
@@ -135,10 +135,27 @@ def run(self):
             arch = os.environ.get("KALEIDO_ARCH", "x64")
             if arch == "x86":
                 cmd_obj.plat_name = "win32"
-        print(cmd_obj.plat_name)
+            elif arch == "x64":
+                cmd_obj.plat_name = "win_amd64"
+            else:
+                raise ValueError(
+                    "Unsupported architecture {arch} for plat_name {plat_name}".format(
+                        arch=arch, plat_name=cmd_obj.plat_name)
+                )
+        elif cmd_obj.plat_name.startswith("linux"):
+            arch = os.environ.get("KALEIDO_ARCH", "x64")
+            if arch == "x64":
+                cmd_obj.plat_name = "manylinux1-x86_64"
+            elif arch == "x86":
+                cmd_obj.plat_name = "manylinux1-i686"
+            elif arch == "arm64":
+                cmd_obj.plat_name = "manylinux2014-aarch64"
+            elif arch == "arm":
+                cmd_obj.plat_name = "manylinux2014-armv7l"
+
         # Set macos platform to 10.10 to match chromium build target (See build/config/mac/mac_sdk.gni)
         # rather than Python environment
-        if cmd_obj.plat_name.startswith("macosx"):
+        elif cmd_obj.plat_name.startswith("macosx"):
             cmd_obj.plat_name = "macosx-10.10-x86_64"
 
         cmd_obj.python_tag = 'py2.py3'
diff --git a/repos/linux_full_scripts/Dockerfile b/repos/linux_full_scripts/Dockerfile
deleted file mode 100644
index 3dcddc46..00000000
--- a/repos/linux_full_scripts/Dockerfile
+++ /dev/null
@@ -1,57 +0,0 @@
-# CLion remote docker environment (How to build docker container, run and stop it)
-#
-# Build and run:
-#   docker build -t jonmmease/kaleido-builder:0.6 -f Dockerfile .
-
-FROM jonmmease/chromium-builder:0.7
-
-
-# Fetch chromium source tree
-RUN \
-    cd / \
-    && fetch --nohooks chromium
-
-# Checkout chromium revision
-RUN \
-    cd /src \
-    && git checkout tags/$CHROMIUM_TAG \
-    && gclient sync -D --force --reset
-    
-RUN gclient runhooks
-    
-# Remove .git directory to save space
-RUN rm -r /src/.git
-
-# TODO: remove .git directories from third-party dependencies under src/third_party
-
-# Build create linux out directory
-RUN \
-    cd /src \
-    && mkdir -p out/Kaleido_linux \
-    && echo 'import("//build/args/headless.gn")' > out/Kaleido_linux/args.gn \
-    && echo 'enable_nacl=false' >> out/Kaleido_linux/args.gn \
-    && echo 'is_component_build=false' >> out/Kaleido_linux/args.gn \
-    && echo 'symbol_level=0' >> out/Kaleido_linux/args.gn \
-    && echo 'blink_symbol_level=0' >> out/Kaleido_linux/args.gn \
-    && echo 'is_debug=false' >> out/Kaleido_linux/args.gn
-
-
-# Add Kaleido executable
-RUN echo ' \
-executable("kaleido") { \
-  sources = [ "app/kaleido.cc" ]  \
-  deps = [  \
-    ":headless_shell_lib",  \
-    "//skia", \
-  ]  \
-} \
-' >> /src/headless/BUILD.gn
-
-    
-# Perform build using headless_example. This will make sure we have all of the 
-# dependencies that Kaleido needs precompiled.
-RUN \
-    cd /src \
-    && gn gen out/Kaleido_linux \
-    && ninja -C out/Kaleido_linux -j 20 headless_example
-    
diff --git a/repos/linux_full_scripts/build_kaleido b/repos/linux_full_scripts/build_kaleido
deleted file mode 100755
index 6af60e13..00000000
--- a/repos/linux_full_scripts/build_kaleido
+++ /dev/null
@@ -1,15 +0,0 @@
-# full path to linux_full_scripots/ directory
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-
-# cd to the top-level project directory
-cd $DIR/../..
-
-# Update version based on git tags
-python ./repos/version/build_pep440_version.py
-
-# Copy README and LICENSE to kaleido directory so it's available in the docker container
-cp ./README.md ./repos/kaleido/
-cp ./LICENSE.txt ./repos/kaleido/
-
-# Perform build using docker
-docker run -it -v `pwd`/repos/:/repos  jonmmease/kaleido-builder:0.7 /repos/linux_full_scripts/build_kaleido_docker
\ No newline at end of file
diff --git a/repos/linux_full_scripts/build_kaleido_docker b/repos/linux_full_scripts/build_kaleido_docker
deleted file mode 100755
index 90a3bcf7..00000000
--- a/repos/linux_full_scripts/build_kaleido_docker
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# perform_kaleido_build expect to be run from src directory
-cd /src
-/repos/linux_scripts/perform_kaleido_build
\ No newline at end of file
diff --git a/repos/linux_scripts/args_arm64.gn b/repos/linux_scripts/args_arm64.gn
new file mode 100644
index 00000000..8e5784da
--- /dev/null
+++ b/repos/linux_scripts/args_arm64.gn
@@ -0,0 +1,9 @@
+import("//build/args/headless.gn")
+enable_nacl=false
+is_component_build=false
+
+symbol_level=0
+blink_symbol_level=0
+is_debug=false
+
+target_cpu="arm64"
\ No newline at end of file
diff --git a/repos/linux_scripts/args.gn b/repos/linux_scripts/args_x64.gn
similarity index 88%
rename from repos/linux_scripts/args.gn
rename to repos/linux_scripts/args_x64.gn
index 4d66d47f..5474bbeb 100644
--- a/repos/linux_scripts/args.gn
+++ b/repos/linux_scripts/args_x64.gn
@@ -5,3 +5,5 @@ is_component_build=false
 symbol_level=0
 blink_symbol_level=0
 is_debug=false
+
+target_cpu="x64"
\ No newline at end of file
diff --git a/repos/linux_scripts/build_kaleido b/repos/linux_scripts/build_kaleido
index f12e3954..99839c78 100755
--- a/repos/linux_scripts/build_kaleido
+++ b/repos/linux_scripts/build_kaleido
@@ -1,3 +1,10 @@
+#!/bin/bash
+if [ $# -eq 0 ]; then
+    echo "No architecture provided"
+    exit 1
+fi
+export KALEIDO_ARCH=$1
+
 # full path to linux_scripots/ directory
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
@@ -12,4 +19,4 @@ cp ./README.md ./repos/kaleido/
 cp ./LICENSE.txt ./repos/kaleido/
 
 # Perform build using docker
-docker run -it -v `pwd`/repos/:/repos  jonmmease/chromium-builder:0.7 /repos/linux_scripts/build_kaleido_docker
+docker run -it -v `pwd`/repos/:/repos  jonmmease/chromium-builder:0.8 /repos/linux_scripts/build_kaleido_docker $KALEIDO_ARCH
diff --git a/repos/linux_scripts/build_kaleido_docker b/repos/linux_scripts/build_kaleido_docker
index f9a0ff83..aa104f6c 100755
--- a/repos/linux_scripts/build_kaleido_docker
+++ b/repos/linux_scripts/build_kaleido_docker
@@ -1,27 +1,21 @@
 #!/bin/bash
 # docker run -it -v /media/jmmease/SSD1/chromium_build/repos/:/repos  jonmmease/chromium-builder:0.5 /repos/build_headless
+if [ $# -eq 0 ]; then
+    echo "No architecture provided"
+    exit 1
+fi
 
-cd /repos/src
-
-# Make output directory
-mkdir -p out/Kaleido_linux
+export KALEIDO_ARCH=$1
 
-# Write out/Kaleido_linux/args.gn
-cp /repos/linux_scripts/args.gn out/Kaleido_linux/args.gn
 
-# 1) Reset headless/BUILD.gn
-git checkout HEAD -- headless/BUILD.gn
+cd /repos/src
 
-# 2) Append kaleido section to headless build file (src/headless/BUILD.gn)
-echo "
-executable(\"kaleido\") {
-  sources = [ \"app/kaleido.cc\" ]
+# Make output directory
+mkdir -p out/Kaleido_linux_$KALEIDO_ARCH
 
-  deps = [
-    \":headless_shell_lib\",
-    \"//skia\",  # we need this to override font render hinting in headless build
-  ]
-}" >> headless/BUILD.gn
+# Write out/Kaleido_linux_$KALEIDO_ARCH/args.gn
+cp /repos/linux_scripts/args_$KALEIDO_ARCH.gn out/Kaleido_linux_$KALEIDO_ARCH/args.gn
+gn gen out/Kaleido_linux_$KALEIDO_ARCH
 
 # perform_kaleido_build expect to be run from src directory
 /repos/linux_scripts/perform_kaleido_build
diff --git a/repos/linux_scripts/checkout_revision_docker b/repos/linux_scripts/checkout_revision_docker
index 94715a60..6d8f2706 100755
--- a/repos/linux_scripts/checkout_revision_docker
+++ b/repos/linux_scripts/checkout_revision_docker
@@ -1,11 +1,28 @@
 #!/bin/bash
 CHROMIUM_TAG="83.0.4103.61"
 
+# Replace any prior .gclient file
+cp ./linux_scripts/gclient .gclient
+
 cd /repos/src
 git reset --hard
 git checkout tags/$CHROMIUM_TAG
 gclient sync -D --force --reset
 gclient runhooks
 
+# Append kaleido section to headless build file (src/headless/BUILD.gn)
+echo "
+executable(\"kaleido\") {
+  sources = [ \"app/kaleido.cc\" ]
+
+  deps = [
+    \":headless_shell_lib\",
+    \"//skia\",  # we need this to override font render hinting in headless build
+  ]
+}" >> headless/BUILD.gn
+
+# Install sysroots
+/repos/src/build/linux/sysroot_scripts/install-sysroot.py --all
+
 # Build credits
 python /repos/src/tools/licenses.py credits > /repos/CREDITS.html
diff --git a/repos/linux_scripts/fetch_chromium b/repos/linux_scripts/fetch_chromium
index b26a25c1..256d757e 100755
--- a/repos/linux_scripts/fetch_chromium
+++ b/repos/linux_scripts/fetch_chromium
@@ -6,7 +6,7 @@ cd $DIR/../..
 echo `pwd`
 
 # Download chromium
-docker run -it -v `pwd`/repos/:/repos  jonmmease/chromium-builder:0.7 /repos/linux_scripts/fetch_chromium_docker
+docker run -it -v `pwd`/repos/:/repos  jonmmease/chromium-builder:0.8 /repos/linux_scripts/fetch_chromium_docker
 
 # Checkout revision
-docker run -it -v `pwd`/repos/:/repos  jonmmease/chromium-builder:0.7 /repos/linux_scripts/checkout_revision_docker
+docker run -it -v `pwd`/repos/:/repos  jonmmease/chromium-builder:0.8 /repos/linux_scripts/checkout_revision_docker
diff --git a/repos/linux_scripts/fetch_chromium_docker b/repos/linux_scripts/fetch_chromium_docker
index 0ab7e267..145b0260 100755
--- a/repos/linux_scripts/fetch_chromium_docker
+++ b/repos/linux_scripts/fetch_chromium_docker
@@ -1,8 +1,13 @@
 #!/bin/bash
 # docker run -it -v /media/jmmease/SSD1/chromium_build/repos/:/repos  jonmmease/chromium-builder:0.5 /repos/fetch_chromium_docker
+
+# Update depot tools for fetch
+cd /depot_tools/
+git pull
+
 cd /repos
 
-# Remove any prior .gclient file
+## Remove any prior .gclient file
 rm -f .gclient
 
 echo "fetch chromium"
diff --git a/repos/linux_scripts/gclient b/repos/linux_scripts/gclient
new file mode 100644
index 00000000..3f241623
--- /dev/null
+++ b/repos/linux_scripts/gclient
@@ -0,0 +1,10 @@
+solutions = [
+  {
+    "url": "https://chromium.googlesource.com/chromium/src.git",
+    "managed": False,
+    "name": "src",
+    "custom_deps": {},
+    "custom_vars": {},
+  },
+]
+target_cpu=["x64", "arm64"]
\ No newline at end of file
diff --git a/repos/linux_scripts/perform_kaleido_build b/repos/linux_scripts/perform_kaleido_build
index 778feecb..3a1607ac 100755
--- a/repos/linux_scripts/perform_kaleido_build
+++ b/repos/linux_scripts/perform_kaleido_build
@@ -2,33 +2,46 @@
 rm -rf headless/app/scopes
 cp -r /repos/kaleido/cc/* headless/app/
 
-# Perform build, result will be out/Kaleido_linux/kaleido
-ninja -C out/Kaleido_linux -j 16 kaleido
+# Perform build, result will be out/Kaleido_linux_$KALEIDO_ARCH/kaleido
+ninja -C out/Kaleido_linux_$KALEIDO_ARCH -j 16 kaleido
 
 # Copy build files
 mkdir -p /repos/build/kaleido/
 rm -rf /repos/build/kaleido/*
 mkdir -p /repos/build/kaleido/bin
-cp out/Kaleido_linux/kaleido /repos/build/kaleido/bin
-cp -r out/Kaleido_linux/swiftshader/ /repos/build/kaleido/bin
+cp out/Kaleido_linux_$KALEIDO_ARCH/kaleido /repos/build/kaleido/bin
+cp -r out/Kaleido_linux_$KALEIDO_ARCH/swiftshader/ /repos/build/kaleido/bin
 
 # copy shared libraries
 mkdir -p /repos/build/kaleido/lib/
 
-# /usr/lib/x86_64-linux-gnu/
-for SO_FILE in libnss3.so libnssutil3.so libnspr4.so libplc4.so libplds4.so libsqlite3.so.0
-do
-  cp /usr/lib/x86_64-linux-gnu/$SO_FILE /repos/build/kaleido/lib/$SO_FILE
-done
+if [ $KALEIDO_ARCH == "x64" ]; then
+  # /usr/lib/x86_64-linux-gnu/
+  for SO_FILE in libnss3.so libnssutil3.so libnspr4.so libplc4.so libplds4.so libsqlite3.so.0
+  do
+    cp /usr/lib/x86_64-linux-gnu/$SO_FILE /repos/build/kaleido/lib/$SO_FILE
+  done
 
-# /usr/lib/x86_64-linux-gnu/nss
-cp /usr/lib/x86_64-linux-gnu/nss/* /repos/build/kaleido/lib/
+  # /usr/lib/x86_64-linux-gnu/nss
+  cp /usr/lib/x86_64-linux-gnu/nss/* /repos/build/kaleido/lib/
 
-# /lib/x86_64-linux-gnu/
-for SO_FILE in libexpat.so.1 # libdl.so.2 libpthread.so.0 librt.so.1 libm.so.6 libgcc_s.so.1 libc.so.6
-do
-  cp /lib/x86_64-linux-gnu/$SO_FILE /repos/build/kaleido/lib/$SO_FILE
-done
+  # /lib/x86_64-linux-gnu/
+  for SO_FILE in libexpat.so.1 # libdl.so.2 libpthread.so.0 librt.so.1 libm.so.6 libgcc_s.so.1 libc.so.6
+  do
+    cp /lib/x86_64-linux-gnu/$SO_FILE /repos/build/kaleido/lib/$SO_FILE
+  done
+
+elif [ $KALEIDO_ARCH == "arm64" ]; then
+    # /usr/lib/aarch64-linux-gnu/
+  for SO_FILE in libnss3.so libnssutil3.so libnspr4.so libplc4.so libplds4.so libsqlite3.so.0
+  do
+    cp /repos/src/build/linux/debian_sid_arm64-sysroot/usr/lib/aarch64-linux-gnu/$SO_FILE /repos/build/kaleido/lib/$SO_FILE
+  done
+
+  # /usr/lib/aarch64-linux-gnu/nss
+  cp /repos/src/build/linux/debian_sid_arm64-sysroot/usr/lib/aarch64-linux-gnu/nss/* /repos/build/kaleido/lib/
+
+fi
 
 # fonts
 mkdir -p /repos/build/kaleido/etc/
diff --git a/repos/win_scripts/build_kaleido.ps1 b/repos/win_scripts/build_kaleido.ps1
index e5613211..069383cb 100644
--- a/repos/win_scripts/build_kaleido.ps1
+++ b/repos/win_scripts/build_kaleido.ps1
@@ -100,7 +100,7 @@ cd ..
 if (Test-Path ..\build\kaleido_win.zip) {
     Remove-Item -Recurse -Force ..\build\kaleido_win.zip
 }
-Compress-Archive -Path ..\build\kaleido -DestinationPath ..\build\kaleido_win.zip
+Compress-Archive -Path ..\build\kaleido -DestinationPath ..\build\kaleido_win_$arch.zip
 
 # Build wheel zip archive
 if (Test-Path ..\kaleido\py\kaleido_wheel.zip) {