diff --git a/Dockerfile-msphpsql b/Dockerfile-msphpsql
index 7d5f65850..f3db7b9d6 100644
--- a/Dockerfile-msphpsql
+++ b/Dockerfile-msphpsql
@@ -1,6 +1,6 @@
-# Download base image ubuntu 18.04
+# Download base image ubuntu 24.04
 
-FROM ubuntu:18.04
+FROM ubuntu:24.04
 
 # Update Ubuntu Software repository
 RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && \
@@ -19,26 +19,27 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && \
     libxml2-dev \
     locales \
     make \
-    php7.3 \
-    php7.3-dev \
-    php7.3-intl \
-    python-pip \
+    php8.4 \
+    php8.4-dev \
+    php8.4-intl \
+    python3-pip \
     re2c \
     unixodbc-dev \
     unzip && apt-get clean && \
-    curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \
-    curl https://packages.microsoft.com/config/ubuntu/18.04/prod.list > /etc/apt/sources.list.d/mssql-release.list && \
+    curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg && \
+    curl https://packages.microsoft.com/config/ubuntu/24.04/prod.list > /etc/apt/sources.list.d/mssql-release.list && \
     apt-get -y update && \
-    export ACCEPT_EULA=Y && apt-get -y install msodbcsql17 mssql-tools && \
-    update-alternatives --set php /usr/bin/php7.3
+    export ACCEPT_EULA=Y && \
+    apt-get -y install msodbcsql18 mssql-tools18 && \
+    update-alternatives --set php /usr/bin/php8.4
 
 ARG PHPSQLDIR=/REPO/msphpsql-dev
-ENV TEST_PHP_SQL_SERVER sql
-ENV TEST_PHP_SQL_UID sa
-ENV TEST_PHP_SQL_PWD Password123
+ENV TEST_PHP_SQL_SERVER=sql
+ENV TEST_PHP_SQL_UID=sa
+ENV TEST_PHP_SQL_PWD=Password123
 
 # update PATH after ODBC driver and tools are installed
-ENV PATH="/opt/mssql-tools/bin:${PATH}"	
+ENV PATH="/opt/mssql-tools18/bin:${PATH}"	
 
 # add locales for testing
 RUN sed -i 's/# en_US ISO-8859-1/en_US ISO-8859-1/g' /etc/locale.gen
@@ -54,9 +55,10 @@ RUN locale-gen
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
 # install coveralls (upgrade both pip and requests first)
-RUN python -m pip install --upgrade pip
-RUN python -m pip install --upgrade requests
-RUN python -m pip install cpp-coveralls
+#RUN python3 -m pip install --upgrade pip
+#RUN python3 -m pip install --upgrade requests
+#RUN python3 -m pip install cpp-coveralls
+#RUN apt install python3-cpp-coveralls
 
 # Either Install git / download zip (One can see other strategies : https://ryanfb.github.io/etc/2015/07/29/git_strategies_for_docker.html )
 #One option is to get source from zip file of repository.
@@ -68,8 +70,8 @@ WORKDIR $PHPSQLDIR/source/
 RUN chmod +x ./packagize.sh
 RUN /bin/bash -c "./packagize.sh"
 
-RUN echo "; priority=20\nextension=sqlsrv.so\n" > /etc/php/7.3/mods-available/sqlsrv.ini
-RUN echo "; priority=30\nextension=pdo_sqlsrv.so\n" > /etc/php/7.3/mods-available/pdo_sqlsrv.ini
+RUN echo "; priority=20\nextension=sqlsrv.so\n" > /etc/php/8.4/mods-available/sqlsrv.ini
+RUN echo "; priority=30\nextension=pdo_sqlsrv.so\n" > /etc/php/8.4/mods-available/pdo_sqlsrv.ini
 
 # create a writable ini file for testing locales
 RUN echo '' > `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/99-overrides.ini
@@ -101,5 +103,5 @@ WORKDIR $PHPSQLDIR
 RUN chmod +x ./entrypoint.sh
 CMD /bin/bash ./entrypoint.sh
 
-ENV REPORT_EXIT_STATUS 1
-ENV TEST_PHP_EXECUTABLE /usr/bin/php
+ENV REPORT_EXIT_STATUS=1
+ENV TEST_PHP_EXECUTABLE=/usr/bin/php
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 599d0398b..e7a15ebf1 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -96,8 +96,8 @@ jobs:
       sudo mv mssql-release.list /etc/apt/sources.list.d/
       sudo apt-get update
       sudo ACCEPT_EULA=Y apt-get install msodbcsql17 mssql-tools
-      echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bash_profile
-      echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bashrc
+      echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bash_profile
+      echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bashrc
       source ~/.bashrc
       sudo apt-get install unixodbc-dev
       odbcinst --j
@@ -116,7 +116,7 @@ jobs:
       docker run -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=$(pwd)' -p 1433:1433 -h $(host) --name=$(host) -d mcr.microsoft.com/mssql/server:2019-latest
       docker ps -a
       sleep 10
-      docker exec -t $(host) /opt/mssql-tools/bin/sqlcmd -S $(server) -U $(uid) -P $(pwd) -Q 'select @@Version'
+      docker exec -t $(host) /opt/mssql-tools18/bin/sqlcmd -S $(server) -U $(uid) -P $(pwd) -Q 'select @@Version'
     displayName: 'Run SQL Server for Linux'
 
   - script: |
diff --git a/entrypoint.sh b/entrypoint.sh
index ffa47b4b4..982498f64 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,6 +1,6 @@
 set -e
 
-testConnection="/opt/mssql-tools/bin/sqlcmd -S sql -U sa -P Password123"
+testConnection="/opt/mssql-tools18/bin/sqlcmd -S sql -U sa -P Password123"
 
 for run in {1..10}; do