diff --git a/manifest.toml b/manifest.toml
index 9f53082..1b820ff 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -76,7 +76,14 @@ ram.runtime = "50M"
     format = "whatever"
     extract = false
     rename = "mariadb-java-client.jar"
-
+    
+    [resources.sources.tomcat9_deb]
+    url = "https://ftp.debian.org/debian/pool/main/t/tomcat9/tomcat9_9.0.43-2~deb11u10_all.deb"
+    sha256 = "0dd30fee78ecd3980e9ee3ba018071755ddf84e2288b860900709f1013e368ed"
+    format = "whatever"
+    extract = false
+    rename = "tomcat9.deb"
+    
     [resources.ports]
     main.default = 8080
     guacd.default = 4822
@@ -112,8 +119,15 @@ ram.runtime = "50M"
         "libssl-dev",
         "libvorbis-dev",
         "libwebp-dev",
-        "tomcat9\\|tomcat10",
     ]
 
+    packages_from_raw_bash = """
+    if [[ $YNH_DEBIAN_VERSION = "bullseye" ]]; then
+        echo "tomcat9";
+    elif [[ $YNH_DEBIAN_VERSION = "bookworm" ]]; then
+        echo "tomcat10";
+    fi
+    """
+
     [resources.database]
     type = "mysql"
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 7c353d9..8c1cae1 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,11 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 
-if [ "$YNH_DEBIAN_VERSION" == "bullseye" ] ; then
-    tomcat_version="tomcat9"
-elif [ "$YNH_DEBIAN_VERSION" == "bookworm" ] ; then
-    tomcat_version="tomcat10"
-fi
+guacamole_version="1.5.5"
 
 #=================================================
 # PERSONAL HELPERS