diff --git a/ct/kimai.sh b/ct/kimai.sh
index b88b47b7e..e360a83e6 100644
--- a/ct/kimai.sh
+++ b/ct/kimai.sh
@@ -20,64 +20,79 @@ color
 catch_errors
 
 function update_script() {
-    header_info
-    check_container_storage
-    check_container_resources
-    if [[ ! -d /opt/kimai ]]; then
-        msg_error "No ${APP} Installation Found!"
-        exit
-    fi
-    RELEASE=$(curl -fsSL https://api.github.com/repos/kimai/kimai/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-    BACKUP_DIR="/opt/kimai_backup"
-
-    if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
-        msg_info "Stopping Apache2"
-        systemctl stop apache2
-        msg_ok "Stopped Apache2"
-
-        msg_info "Backing up Kimai configuration and var directory"
-        mkdir -p "$BACKUP_DIR"
-        [ -d /opt/kimai/var ] && cp -r /opt/kimai/var "$BACKUP_DIR/"
-        [ -f /opt/kimai/.env ] && cp /opt/kimai/.env "$BACKUP_DIR/"
-        [ -f /opt/kimai/config/packages/local.yaml ] && cp /opt/kimai/config/packages/local.yaml "$BACKUP_DIR/"
-        msg_ok "Backup completed"
-
-        msg_info "Updating ${APP} to ${RELEASE}"
-        rm -rf /opt/kimai
-        curl -fsSL "https://github.com/kimai/kimai/archive/refs/tags/${RELEASE}.zip" -o $(basename "https://github.com/kimai/kimai/archive/refs/tags/${RELEASE}.zip")
-        unzip -q ${RELEASE}.zip
-        mv kimai-${RELEASE} /opt/kimai
-        [ -d "$BACKUP_DIR/var" ] && cp -r "$BACKUP_DIR/var" /opt/kimai/
-        [ -f "$BACKUP_DIR/.env" ] && cp "$BACKUP_DIR/.env" /opt/kimai/
-        [ -f "$BACKUP_DIR/local.yaml" ] && cp "$BACKUP_DIR/local.yaml" /opt/kimai/config/packages/
-        rm -rf "$BACKUP_DIR"
-        cd /opt/kimai
-        $STD composer install --no-dev --optimize-autoloader
-        $STD bin/console kimai:update
-        echo "${RELEASE}" >/opt/${APP}_version.txt
-        msg_ok "Updated ${APP} to ${RELEASE}"
-
-        msg_info "Starting Apache2"
-        systemctl start apache2
-        msg_ok "Started Apache2"
-
-        msg_info "Setup Permissions"
-        chown -R :www-data /opt/*
-        chmod -R g+r /opt/*
-        chmod -R g+rw /opt/*
-        chown -R www-data:www-data /opt/*
-        chmod -R 777 /opt/*
-        msg_ok "Setup Permissions"
-
-        msg_info "Cleaning Up"
-        rm -rf ${RELEASE}.zip
-        rm -rf "$BACKUP_DIR"
-        msg_ok "Cleaned"
-        msg_ok "Updated Successfully"
-    else
-        msg_ok "No update required. ${APP} is already at ${RELEASE}"
-    fi
+  header_info
+  check_container_storage
+  check_container_resources
+  if [[ ! -d /opt/kimai ]]; then
+    msg_error "No ${APP} Installation Found!"
     exit
+  fi
+  CURRENT_PHP=$(php -v 2>/dev/null | awk '/^PHP/{print $2}' | cut -d. -f1,2)
+  if [[ "$CURRENT_PHP" != "8.4" ]]; then
+    msg_info "Migrating PHP $CURRENT_PHP to 8.4"
+    $STD curl -fsSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb
+    $STD dpkg -i /tmp/debsuryorg-archive-keyring.deb
+    $STD sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
+    $STD apt-get update
+    $STD apt-get remove -y php"${CURRENT_PHP//./}"*
+    $STD apt-get install -y \
+      php8.4 \
+      php8.4-{gd,mysql,mbstring,bcmath,xml,curl,zip,intl} \
+      libapache2-mod-php8.4
+    msg_ok "Migrated PHP $CURRENT_PHP to 8.4"
+  fi
+
+  RELEASE=$(curl -fsSL https://api.github.com/repos/kimai/kimai/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
+  BACKUP_DIR="/opt/kimai_backup"
+
+  if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
+    msg_info "Stopping Apache2"
+    systemctl stop apache2
+    msg_ok "Stopped Apache2"
+
+    msg_info "Backing up Kimai configuration and var directory"
+    mkdir -p "$BACKUP_DIR"
+    [ -d /opt/kimai/var ] && cp -r /opt/kimai/var "$BACKUP_DIR/"
+    [ -f /opt/kimai/.env ] && cp /opt/kimai/.env "$BACKUP_DIR/"
+    [ -f /opt/kimai/config/packages/local.yaml ] && cp /opt/kimai/config/packages/local.yaml "$BACKUP_DIR/"
+    msg_ok "Backup completed"
+
+    msg_info "Updating ${APP} to ${RELEASE}"
+    rm -rf /opt/kimai
+    curl -fsSL "https://github.com/kimai/kimai/archive/refs/tags/${RELEASE}.zip" -o $(basename "https://github.com/kimai/kimai/archive/refs/tags/${RELEASE}.zip")
+    unzip -q "${RELEASE}".zip
+    mv kimai-"${RELEASE}" /opt/kimai
+    [ -d "$BACKUP_DIR/var" ] && cp -r "$BACKUP_DIR/var" /opt/kimai/
+    [ -f "$BACKUP_DIR/.env" ] && cp "$BACKUP_DIR/.env" /opt/kimai/
+    [ -f "$BACKUP_DIR/local.yaml" ] && cp "$BACKUP_DIR/local.yaml" /opt/kimai/config/packages/
+    rm -rf "$BACKUP_DIR"
+    cd /opt/kimai || exit
+    $STD composer install --no-dev --optimize-autoloader
+    $STD bin/console kimai:update
+    echo "${RELEASE}" >/opt/${APP}_version.txt
+    msg_ok "Updated ${APP} to ${RELEASE}"
+
+    msg_info "Starting Apache2"
+    systemctl start apache2
+    msg_ok "Started Apache2"
+
+    msg_info "Setup Permissions"
+    chown -R :www-data /opt/*
+    chmod -R g+r /opt/*
+    chmod -R g+rw /opt/*
+    chown -R www-data:www-data /opt/*
+    chmod -R 777 /opt/*
+    msg_ok "Setup Permissions"
+
+    msg_info "Cleaning Up"
+    rm -rf "${RELEASE}".zip
+    rm -rf "$BACKUP_DIR"
+    msg_ok "Cleaned"
+    msg_ok "Updated Successfully"
+  else
+    msg_ok "No update required. ${APP} is already at ${RELEASE}"
+  fi
+  exit
 }
 
 start
diff --git a/install/kimai-install.sh b/install/kimai-install.sh
index b43415f88..1d6459b0b 100644
--- a/install/kimai-install.sh
+++ b/install/kimai-install.sh
@@ -24,21 +24,20 @@ $STD apt-get install -y \
   lsb-release
 msg_ok "Installed Dependencies"
 
-msg_info "Setup PHP8.4 Repository"
-$STD curl -fsSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb
+msg_info "Adding PHP8.4 Repository"
+$STD curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb
 $STD dpkg -i /tmp/debsuryorg-archive-keyring.deb
 $STD sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
 $STD apt-get update
-msg_ok "Setup PHP8.4 Repository"
+msg_ok "Added PHP8.4 Repository"
 
-msg_info "Setup PHP"
+msg_info "Installing PHP"
 $STD apt-get remove -y php8.2*
-#$STD apt-get remove -y php8.3*
 $STD apt-get install -y \
-  php8.3 \
-  php8.3-{mbstring,gd,intl,common,mysql,zip,xml} \
-  libapache2-mod-php8.3
-msg_info "Setup PHP"
+  php8.4 \
+  php8.4-{gd,mysql,mbstring,bcmath,xml,curl,zip,intl} \
+  libapache2-mod-php8.4
+msg_ok "Installed PHP"
 
 msg_info "Setting up database"
 DB_NAME=kimai_db
@@ -59,9 +58,9 @@ msg_ok "Set up database"
 msg_info "Installing Kimai (Patience)"
 RELEASE=$(curl -fsSL https://api.github.com/repos/kimai/kimai/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
 curl -fsSL "https://github.com/kimai/kimai/archive/refs/tags/${RELEASE}.zip" -o $(basename "https://github.com/kimai/kimai/archive/refs/tags/${RELEASE}.zip")
-unzip -q ${RELEASE}.zip
-mv kimai-${RELEASE} /opt/kimai
-cd /opt/kimai
+unzip -q "${RELEASE}".zip
+mv kimai-"${RELEASE}" /opt/kimai
+cd /opt/kimai || exit
 echo "export COMPOSER_ALLOW_SUPERUSER=1" >>~/.bashrc
 source ~/.bashrc
 $STD composer install --no-dev --optimize-autoloader --no-interaction
@@ -130,7 +129,7 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
-rm -rf ${RELEASE}.zip
+rm -rf "${RELEASE}".zip
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
 msg_ok "Cleaned"