diff --git a/ct/termix.sh b/ct/termix.sh
index 71e0a030d..a22c35b64 100644
--- a/ct/termix.sh
+++ b/ct/termix.sh
@@ -56,10 +56,7 @@ function update_script() {
       libavformat-dev
 
     msg_info "Updating Guacamole Server (guacd)"
-    mkdir -p /opt/guacamole-server
-    download_file "https://github.com/apache/guacamole-server/archive/refs/tags/${CHECK_UPDATE_RELEASE}.tar.gz" "/tmp/guacamole-server.tar.gz"
-    tar -xzf /tmp/guacamole-server.tar.gz --strip-components=1 -C /opt/guacamole-server
-    rm -f /tmp/guacamole-server.tar.gz
+    CLEAN_INSTALL=1 fetch_and_deploy_gh_tag "guacd" "apache/guacamole-server" "/opt/guacamole-server"
     cd /opt/guacamole-server
     export CPPFLAGS="-Wno-error=deprecated-declarations"
     $STD autoreconf -fi
@@ -67,7 +64,6 @@ function update_script() {
     $STD make
     $STD make install
     $STD ldconfig
-    echo "${CHECK_UPDATE_RELEASE}" >~/.guacd
     cd /opt
     rm -rf /opt/guacamole-server
     msg_ok "Updated Guacamole Server (guacd) to ${CHECK_UPDATE_RELEASE}"
diff --git a/install/termix-install.sh b/install/termix-install.sh
index b364e4a0b..15c854626 100644
--- a/install/termix-install.sh
+++ b/install/termix-install.sh
@@ -43,10 +43,8 @@ msg_ok "Installed Dependencies"
 
 msg_info "Building Guacamole Server (guacd)"
 GUAC_SERVER_VERSION=$(get_latest_gh_tag "apache/guacamole-server")
-mkdir -p /opt/guacamole-server
-download_file "https://github.com/apache/guacamole-server/archive/refs/tags/${GUAC_SERVER_VERSION}.tar.gz" "/tmp/guacamole-server.tar.gz"
-tar -xzf /tmp/guacamole-server.tar.gz --strip-components=1 -C /opt/guacamole-server
-rm -f /tmp/guacamole-server.tar.gz
+CHECK_UPDATE_RELEASE="$GUAC_SERVER_VERSION"
+CLEAN_INSTALL=1 fetch_and_deploy_gh_tag "guacd" "apache/guacamole-server" "/opt/guacamole-server"
 cd /opt/guacamole-server
 export CPPFLAGS="-Wno-error=deprecated-declarations"
 $STD autoreconf -fi
@@ -54,7 +52,6 @@ $STD ./configure --with-init-dir=/etc/init.d --enable-allow-freerdp-snapshots
 $STD make
 $STD make install
 $STD ldconfig
-echo "${GUAC_SERVER_VERSION}" >~/.guacd
 cd /opt
 rm -rf /opt/guacamole-server
 msg_ok "Built Guacamole Server (guacd) ${GUAC_SERVER_VERSION}"