diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c41885..1ed53ac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ services:
 variables:
   DOCKER_AUTH_CONFIG: ${_DOCKER_AUTH_CONFIG}
   PLATFORM: "linux/amd64"
-  ARM_BUILDS: ",chromium,firefox,gimp,rdesktop,remmina,terminal,ubuntu-bionic-desktop,ubuntu-focal-desktop,vlc,vs-code,"
+  ARM_BUILDS: ",chromium,firefox,gimp,rdesktop,remmina,terminal,ubuntu-bionic-desktop,ubuntu-focal-desktop,vlc,vs-code,doom,sublime-text,tor-browser,java-dev,telegram,"
   CORE_IMAGE_TAG: "develop"
   CORE_IMAGE: "core-ubuntu-focal"
   USE_PRIVATE_IMAGES: 0
@@ -397,4 +397,4 @@ update_readmes:
       - $README_PASSWORD
   parallel:
     matrix:
-      - KASM_IMAGE: [chrome, chromium, firefox, desktop, desktop-deluxe, firefox-mobile, tor-browser, doom, edge, terminal, vmware-horizon, remmina, rdesktop, brave, discord, sublime-text, gimp, vs-code, slack, teams, only-office, zoom, signal, steam, postman, insomnia, zsnes, vlc, ubuntu-focal-desktop, maltego, centos-7-desktop, telegram, hunchly, ubuntu-focal-dind, ubuntu-focal-dind-rootless, tracelabs, java-dev ]
\ No newline at end of file
+      - KASM_IMAGE: [chrome, chromium, firefox, desktop, desktop-deluxe, firefox-mobile, tor-browser, doom, edge, terminal, vmware-horizon, remmina, rdesktop, brave, discord, sublime-text, gimp, vs-code, slack, teams, only-office, zoom, signal, steam, postman, insomnia, zsnes, vlc, ubuntu-focal-desktop, maltego, centos-7-desktop, telegram, hunchly, ubuntu-focal-dind, ubuntu-focal-dind-rootless, tracelabs, java-dev ]
diff --git a/src/ubuntu/install/eclipse/install_eclipse.sh b/src/ubuntu/install/eclipse/install_eclipse.sh
index 0b69e03..caa3e5f 100644
--- a/src/ubuntu/install/eclipse/install_eclipse.sh
+++ b/src/ubuntu/install/eclipse/install_eclipse.sh
@@ -3,7 +3,7 @@
 ECLIPSE_VER_DATE="2021-12"
 
 cd /tmp
-wget -q -O eclipse.tar.gz "https://mirrors.xmission.com/eclipse/technology/epp/downloads/release/${ECLIPSE_VER_DATE}/R/eclipse-java-${ECLIPSE_VER_DATE}-R-linux-gtk-x86_64.tar.gz"
+wget -q -O eclipse.tar.gz "https://mirrors.xmission.com/eclipse/technology/epp/downloads/release/${ECLIPSE_VER_DATE}/R/eclipse-java-${ECLIPSE_VER_DATE}-R-linux-gtk-$(arch).tar.gz"
 tar -xzf eclipse.tar.gz -C /opt
 
 ECLIPSE_ICON="/opt/eclipse/plugins/$(ls /opt/eclipse/plugins/ | grep -m 1 org.eclipse.platform_)/eclipse128.png"
diff --git a/src/ubuntu/install/sublime_text/install_sublime_text.sh b/src/ubuntu/install/sublime_text/install_sublime_text.sh
index 4d042b0..c811142 100644
--- a/src/ubuntu/install/sublime_text/install_sublime_text.sh
+++ b/src/ubuntu/install/sublime_text/install_sublime_text.sh
@@ -1,12 +1,6 @@
 #!/usr/bin/env bash
 set -ex
 
-ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')
-if [ "$ARCH" == "arm64" ] ; then
-  echo "Sublimetext not supported on arm64, skipping installation"
-  exit 0
-fi
-
 apt-get update
 wget -qO - https://download.sublimetext.com/sublimehq-pub.gpg | apt-key add -
 apt-get install -y apt-transport-https
diff --git a/src/ubuntu/install/telegram/custom_startup.sh b/src/ubuntu/install/telegram/custom_startup.sh
index 0f4e297..9d4aff5 100644
--- a/src/ubuntu/install/telegram/custom_startup.sh
+++ b/src/ubuntu/install/telegram/custom_startup.sh
@@ -1,7 +1,12 @@
 #!/usr/bin/env bash
 set -ex
-START_COMMAND="/opt/Telegram/Telegram"
-PGREP="Telegram"
+if [ "$(arch)" == "aarch64" ]; then
+  START_COMMAND="/usr/bin/telegram-desktop"
+  PGREP="telegram-desktop"
+else 
+  START_COMMAND="/opt/Telegram/Telegram"
+  PGREP="Telegram"
+fi
 export MAXIMIZE="false"
 MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
 DEFAULT_ARGS="--no-sandbox"
diff --git a/src/ubuntu/install/telegram/install_telegram.sh b/src/ubuntu/install/telegram/install_telegram.sh
index 281542d..2119ce3 100644
--- a/src/ubuntu/install/telegram/install_telegram.sh
+++ b/src/ubuntu/install/telegram/install_telegram.sh
@@ -4,18 +4,17 @@ set -ex
 ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')
 
 if [ "${ARCH}" == "arm64" ] ; then
-    echo "Telegram for arm64 currently not supported, skipping install"
-    exit 0
-fi
+  apt-get update
+  apt-get install -y telegram-desktop
+  cp /usr/share/applications/telegramdesktop.desktop $HOME/Desktop/telegram.desktop
+else
+  wget -q https://telegram.org/dl/desktop/linux -O /tmp/telegram.tgz
+  tar -xvf /tmp/telegram.tgz -C /opt/
+  rm -rf /tmp/telegram.tgz
 
+  wget -q https://kasm-static-content.s3.amazonaws.com/icons/telegram.png -O /opt/Telegram/telegram_icon.png
 
-wget -q https://telegram.org/dl/desktop/linux -O /tmp/telegram.tgz
-tar -xvf /tmp/telegram.tgz -C /opt/
-rm -rf /tmp/telegram.tgz
-
-wget -q https://kasm-static-content.s3.amazonaws.com/icons/telegram.png -O /opt/Telegram/telegram_icon.png
-
-cat >/usr/share/applications/telegram.desktop <<EOL
+  cat >/usr/share/applications/telegram.desktop <<EOL
 [Desktop Entry]
 Version=1.0
 Name=Telegram Desktop
@@ -31,6 +30,7 @@ MimeType=x-scheme-handler/tg;
 Keywords=tg;chat;im;messaging;messenger;sms;tdesktop;
 X-GNOME-UsesNotifications=true
 EOL
-chmod +x /usr/share/applications/telegram.desktop
-cp /usr/share/applications/telegram.desktop $HOME/Desktop/telegram.desktop
+  chmod +x /usr/share/applications/telegram.desktop
+  cp /usr/share/applications/telegram.desktop $HOME/Desktop/telegram.desktop
+fi
 chown 1000:1000 $HOME/Desktop/telegram.desktop
diff --git a/src/ubuntu/install/torbrowser/install_torbrowser.sh b/src/ubuntu/install/torbrowser/install_torbrowser.sh
index 1cf2882..35b1d8b 100644
--- a/src/ubuntu/install/torbrowser/install_torbrowser.sh
+++ b/src/ubuntu/install/torbrowser/install_torbrowser.sh
@@ -5,8 +5,14 @@ echo "Install TorBrowser"
 apt-get install -y xz-utils curl
 TOR_HOME=$HOME/tor-browser/
 mkdir -p $TOR_HOME
-TOR_URL=$(curl -q https://www.torproject.org/download/ | grep downloadLink | grep linux64 | sed 's/.*href="//g'  | cut -d '"' -f1 | head -1)
-wget --quiet https://www.torproject.org/${TOR_URL} -O /tmp/torbrowser.tar.xz
+if [ "$(arch)" == "aarch64" ]; then
+  SF_VERSION=$(curl -sI https://sourceforge.net/projects/tor-browser-ports/files/latest/download | awk -F'(ports/|/tor)' '/location/ {print $3}')
+  FULL_TOR_URL="https://downloads.sourceforge.net/project/tor-browser-ports/${SF_VERSION}/tor-browser-linux-arm64-${SF_VERSION}_en-US.tar.xz"
+else
+  TOR_URL=$(curl -q https://www.torproject.org/download/ | grep downloadLink | grep linux64 | sed 's/.*href="//g'  | cut -d '"' -f1 | head -1)
+  FULL_TOR_URL="https://www.torproject.org/${TOR_URL}"
+fi
+wget --quiet "${FULL_TOR_URL}" -O /tmp/torbrowser.tar.xz
 tar -xJf /tmp/torbrowser.tar.xz -C $TOR_HOME
 rm /tmp/torbrowser.tar.xz