diff --git a/ct/keycloak.sh b/ct/keycloak.sh
index 02fe4612af..d50684b8c3 100644
--- a/ct/keycloak.sh
+++ b/ct/keycloak.sh
@@ -27,38 +27,50 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-
-  msg_info "Stopping Keycloak"
-  systemctl stop keycloak
-  msg_ok "Stopped Keycloak"
-
-  msg_info "Updating packages"
-  $STD apt-get update
-  $STD apt-get -y upgrade
-  msg_ok "Updated packages"
-
-  msg_info "Backup old Keycloak"
-  cd /opt
-  mv keycloak keycloak.old
-  tar -czf keycloak_conf_backup.tar.gz keycloak.old/conf
-  msg_ok "Backup done"
-
-  fetch_and_deploy_gh_release "keycloak" "keycloak/keycloak" "prebuild" "latest" "/opt/keycloak" "keycloak-*.tar.gz"
-
-  msg_info "Updating ${APP}"
-  cd /opt
-  mv keycloak_conf_backup.tar.gz keycloak/conf
-  cp -r keycloak.old/providers keycloak
-  cp -r keycloak.old/themes keycloak
-  rm -rf keycloak.old
-  msg_ok "Updated ${APP} LXC"
-
-  msg_info "Restarting Keycloak"
-  systemctl restart keycloak
-  msg_ok "Restarted Keycloak"
+  if ! command -v jq &>/dev/null; then
+    $STD apt-get install -y jq
+  fi
+  
+  RELEASE=$(curl -fsSL https://api.github.com/repos/keycloak/keycloak/releases/latest | jq -r '.tag_name' | sed 's/^v//')
+  if [[ "${RELEASE}" != "$(cat ~/.keycloak_app 2>/dev/null)" ]] || [[ ! -f ~/.keycloak_app ]]; then
+    msg_info "Stopping Keycloak"
+    systemctl stop keycloak
+    msg_ok "Stopped Keycloak"
+  
+    msg_info "Updating packages"
+    $STD apt-get update
+    $STD apt-get -y upgrade
+    msg_ok "Updated packages"
+  
+    msg_info "Backup old Keycloak"
+    cd /opt
+    mv keycloak keycloak.old
+    msg_ok "Backup done"
+  
+    fetch_and_deploy_gh_release "keycloak_app" "keycloak/keycloak" "prebuild" "latest" "/opt/keycloak" "keycloak-*.tar.gz"
+  
+    msg_info "Updating ${APP}"
+    cd /opt
+    cp -a keycloak.old/conf/. keycloak/conf/
+    cp -a keycloak.old/providers/. keycloak/providers/ 2>/dev/null || true
+    cp -a keycloak.old/themes/. keycloak/themes/ 2>/dev/null || true
+    msg_ok "Updated ${APP} LXC"
+  
+    msg_info "Restarting Keycloak"
+    systemctl restart keycloak
+    msg_ok "Restarted Keycloak"
+  
+    msg_info "Cleaning up"
+    rm -rf keycloak.old
+    msg_ok "Cleanup complete"
+    msg_ok "Update Successful"
+  else
+    msg_ok "No update required. ${APP} is already at v${RELEASE}"
+  fi
   exit
 }
 
+
 start
 build_container
 description
diff --git a/install/keycloak-install.sh b/install/keycloak-install.sh
index 83bc5a35d6..9130fd6bdf 100644
--- a/install/keycloak-install.sh
+++ b/install/keycloak-install.sh
@@ -25,7 +25,7 @@ $STD sudo -u postgres psql -c "CREATE DATABASE $DB_NAME WITH OWNER $DB_USER ENCO
 $STD sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE $DB_NAME TO $DB_USER;"
 msg_ok "Configured PostgreSQL"
 
-fetch_and_deploy_gh_release "keycloak" "keycloak/keycloak" "prebuild" "latest" "/opt/keycloak" "keycloak-*.tar.gz"
+fetch_and_deploy_gh_release "keycloak_app" "keycloak/keycloak" "prebuild" "latest" "/opt/keycloak" "keycloak-*.tar.gz"
 
 msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/keycloak.service