diff --git a/scripts/install-base.sh b/scripts/install-base.sh
index daf0d37..c07b837 100755
--- a/scripts/install-base.sh
+++ b/scripts/install-base.sh
@@ -2,7 +2,7 @@
 #
 # Author  : Gaston Gonzalez
 # Date    : 16 March 2024
-# Updated : 6 October 2024
+# Updated : 11 November 2024
 # Purpose : Install base tools and configuration
 set -e
 
@@ -21,7 +21,7 @@ apt install \
   gpg \
   jq \
   net-tools \
-  openjdk-11-jdk \
+  openjdk-20-jdk \
   openssh-server \
   screen \
   stow \
diff --git a/scripts/install-yaac.sh b/scripts/install-yaac.sh
new file mode 100755
index 0000000..2e6e2b3
--- /dev/null
+++ b/scripts/install-yaac.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+# Author  : Gaston Gonzalez
+# Date    : 3 November 2024
+# Purpose : Install YAAC
+set -e
+trap 'last_command=$current_command; current_command=$BASH_COMMAND' DEBUG
+trap 'et-log "\"${last_command}\" command failed with exit code $?."' ERR
+
+VERSION=latest
+ZIP_FILE=YAAC.zip
+INSTALL_DIR=/opt/yaac-${VERSION}
+LINK_PATH=/opt/yaac
+
+et-log "Installing YAAC..."
+
+if [ ! -e ${ET_DIST_DIR}/${ZIP_FILE} ]; then
+
+  URL=https://www.ka2ddo.org/ka2ddo/${ZIP_FILE}
+
+  et-log "Downloading YAAC: ${URL}"
+  curl -s -L -o ${ZIP_FILE} --fail ${URL}
+
+  [ ! -e ${ET_DIST_DIR} ] && mkdir ${ET_DIST_DIR}
+  [ ! -e ${ET_SRC_DIR} ] && mkdir ${ET_SRC_DIR}
+  
+  mv -v ${ZIP_FILE} ${ET_DIST_DIR}
+fi
+
+CWD_DIR=$(pwd)
+
+if [ ! -e ${INSTALL_DIR} ]; then
+  mkdir -v ${INSTALL_DIR} && cd ${INSTALL_DIR}
+  unzip ${ET_DIST_DIR}/${ZIP_FILE}
+else
+  et-log "${INSTALL_DIR} already exists."
+fi
+
+[ -e ${LINK_PATH} ] && rm ${LINK_PATH}
+ln -s ${INSTALL_DIR} ${LINK_PATH}
+
+cd ${CWD_DIR}
diff --git a/scripts/install.sh b/scripts/install.sh
index 9f825a4..7fda58c 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -2,7 +2,7 @@
 #
 # Author  : Gaston Gonzalez
 # Date    : 16 March 2024
-# Updated : 30 October 2024
+# Updated : 3 November 2024
 # Purpose : Main installer for EmComm Tools OS Community
 
 . ./env.sh
@@ -35,6 +35,8 @@ exitIfNotRoot
 
 ./install-conky.sh
 
+# Install packet tool chain
 ./install-direwolf.sh
+./install-yaac.sh
 
 ./install-audio-tools.sh