diff --git a/Dockerfile b/Dockerfile
index 9a6866a..12f321d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-fpm-alpine
+FROM php:8-fpm-alpine
 
 LABEL maintainer="Ric Harvey <ric@ngd.io>"
 
@@ -69,7 +69,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
   " \
   && addgroup -S nginx \
   && adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx \ 
-  && apk add --no-cache --virtual .build-deps \
+  &&  apk add --no-cache --virtual .build-deps \
     autoconf \
     gcc \
     libc-dev \
@@ -85,7 +85,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
  #   geoip-dev \
     libmaxminddb-dev \
     perl-dev \
-    luajit-dev \
+    luajit-dev\
   && curl -fSL http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz -o nginx.tar.gz \
   && curl -fSL http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz.asc  -o nginx.tar.gz.asc \
   && curl -fSL https://github.com/simpl/ngx_devel_kit/archive/v$DEVEL_KIT_MODULE_VERSION.tar.gz -o ndk.tar.gz \
@@ -204,8 +204,8 @@ RUN echo /etc/apk/respositories && \
       --with-jpeg && \
     #curl iconv session
     #docker-php-ext-install pdo_mysql pdo_sqlite mysqli mcrypt gd exif intl xsl json soap dom zip opcache && \
-    docker-php-ext-install iconv pdo_mysql pdo_sqlite pgsql pdo_pgsql mysqli gd exif intl xsl json soap dom zip opcache && \
-    pecl install xdebug-2.9.2 && \
+    docker-php-ext-install pdo_mysql pgsql pdo_pgsql mysqli gd exif intl xsl soap zip opcache && \
+    pecl install xdebug-3.1.2 && \
     pecl install -o -f redis && \
     echo "extension=redis.so" > /usr/local/etc/php/conf.d/redis.ini && \
     docker-php-source delete && \
diff --git a/build.sh b/build.sh
index edb520c..d7cc0ef 100755
--- a/build.sh
+++ b/build.sh
@@ -9,5 +9,5 @@ docker buildx create --name phpbuilder
 docker buildx use phpbuilder
 
 echo "Building: PHP Container"
-docker buildx build --platform linux/amd64,linux/arm64 -t "gschulte/nginx-php-fpm:${VERSION}" -t gschulte/nginx-php-fpm:latest --push .
+docker buildx build --platform linux/amd64,linux/arm64 -t "gschulte/nginx-php-fpm:php8-${VERSION}" --push .