diff --git a/ct/5etools.sh b/ct/5etools.sh
index 5c423fe8..78b33297 100644
--- a/ct/5etools.sh
+++ b/ct/5etools.sh
@@ -35,29 +35,62 @@ function update_script() {
         exit
     fi
 
-    # Crawling the new version and checking whether an update is required
-    msg_info "Updating System"
-    apt-get update &>/dev/null
-    apt-get -y upgrade &>/dev/null
-    msg_ok "Updated System"
+    RELEASE=$(curl -s https://api.github.com/repos/5etools-mirror-3/5etools-src/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
+    if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]] || [[ ! -f "/opt/${APP}_version.txt" ]]; then
+        # Crawling the new version and checking whether an update is required
+        msg_info "Updating System"
+        apt-get update &>/dev/null
+        apt-get -y upgrade &>/dev/null
+        msg_ok "Updated System"
 
-    # Execute Update
-    msg_info "Updating 5etools"
-    cd /opt/5etools
-    git config --global http.postBuffer 1048576000
-    git config --global https.postBuffer 1048576000
-    git pull --recurse-submodules --jobs=10
-    msg_ok "Updated 5etools"
+        # Execute Update
+        msg_info "Updating base 5etools"
+        wget -q "https://github.com/5etools-mirror-3/5etools-src/archive/refs/tags/${RELEASE}.zip"
+        unzip "${RELEASE}.zip" -d "/opt/${APP}"
+        echo "${RELEASE}" >"/opt/${APP}_version.txt"
+        msg_ok "Updated base 5etools"
 
-    chown -R www-data: "/opt/${APP}"
-    chmod -R 755 "/opt/${APP}"
+        chown -R www-data: "/opt/${APP}"
+        chmod -R 755 "/opt/${APP}"
+
+        # Cleaning up
+        msg_info "Cleaning Up"
+        rm "${RELEASE}.zip"
+        $STD apt-get -y autoremove
+        $STD apt-get -y autoclean
+        msg_ok "Cleanup Completed"
+    else
+        msg_ok "No update required. Base ${APP} is already at ${RELEASE}"
+    fi
+
+    IMG_RELEASE=$(curl -s https://api.github.com/repos/5etools-mirror-2/5etools-img/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
+    if [[ "${IMG_RELEASE}" != "$(cat /opt/${APP}_IMG_version.txt)" ]] || [[ ! -f "/opt/${APP}_IMG_version.txt" ]]; then
+        # Crawling the new version and checking whether an update is required
+        msg_info "Updating System"
+        apt-get update &>/dev/null
+        apt-get -y upgrade &>/dev/null
+        msg_ok "Updated System"
+
+        # Execute Update
+        msg_info "Updating 5etools images"
+        wget -q "https://github.com/5etools-mirror-2/5etools-img/archive/refs/tags/${IMG_RELEASE}.zip"
+        unzip "${IMG_RELEASE}.zip" -d "/opt/${APP}/img"
+        echo "${IMG_RELEASE}" >"/opt/${APP}_IMG_version.txt"
+        msg_ok "Updating 5etools images"
+
+        chown -R www-data: "/opt/${APP}"
+        chmod -R 755 "/opt/${APP}"
+
+        # Cleaning up
+        msg_info "Cleaning Up"
+        rm "${IMG_RELEASE}.zip"
+        $STD apt-get -y autoremove
+        $STD apt-get -y autoclean
+        msg_ok "Cleanup Completed"
+    else
+        msg_ok "No update required. ${APP} images are already at ${IMG_RELEASE}"
+    fi
 
-    # Cleaning up
-    msg_info "Cleaning Up"
-    $STD apt-get -y autoremove
-    $STD apt-get -y autoclean
-    msg_ok "Cleanup Completed"
-    exit
 }
 
 start
diff --git a/install/5etools-install.sh b/install/5etools-install.sh
index 971057c9..5040707e 100644
--- a/install/5etools-install.sh
+++ b/install/5etools-install.sh
@@ -20,20 +20,26 @@ $STD apt-get install -y \
   mc \
   sudo \
   git \
-  apache2
+  apache2 \
+  unzip
 msg_ok "Installed Dependencies"
 
 # Setup App
-msg_info "Setup 5etools"
-rm -rf /var/www/html
-git config --global http.postBuffer 1048576000
-git config --global https.postBuffer 1048576000
-git clone https://github.com/5etools-mirror-3/5etools-src /opt/5etools
-cd /opt/5etools
-git submodule add -f https://github.com/5etools-mirror-2/5etools-img "img"
-git pull --recurse-submodules --jobs=10
-cd ~
-msg_ok "Set up 5etools"
+msg_info "Set up base 5etools"
+RELEASE=$(curl -s https://api.github.com/repos/5etools-mirror-3/5etools-src/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
+wget -q "https://github.com/5etools-mirror-3/5etools-src/archive/refs/tags/${RELEASE}.zip"
+unzip "${RELEASE}.zip" -d "/opt/${APP}"
+echo "${RELEASE}" >"/opt/${APP}_version.txt"
+rm "${RELEASE}.zip"
+msg_ok "Set up base 5etools"
+
+msg_info "Set up 5etools images"
+IMG_RELEASE=$(curl -s https://api.github.com/repos/5etools-mirror-2/5etools-img/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
+wget -q "https://github.com/5etools-mirror-2/5etools-img/archive/refs/tags/${IMG_RELEASE}.zip"
+unzip "${IMG_RELEASE}.zip" -d "/opt/${APP}/img"
+echo "${IMG_RELEASE}" >"/opt/${APP}_IMG_version.txt"
+rm "${IMG_RELEASE}.zip"
+msg_ok "Set up 5etools images"
 
 msg_info "Creating Service"
 cat <<EOF >> /etc/apache2/apache2.conf