diff --git a/.github/workflows/manual.yaml b/.github/workflows/manual.yaml
index 2089caa..16290b1 100644
--- a/.github/workflows/manual.yaml
+++ b/.github/workflows/manual.yaml
@@ -53,6 +53,7 @@ jobs:
         with:
           file: "./src/docker/8.0/Dockerfile"
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: "${{env.BUILDKIT_IMAGE}}:8.0"
       -
         name: Build and push 8.1
diff --git a/docker-compose.yml b/docker-compose.yml
index 083eee1..71fa3b6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
     php-fpm:
-        image: jkaninda/laravel-php-fpm:latest
+        image: jkaninda/laravel-php-fpm:8.2
         container_name: php-fpm
         restart: unless-stopped     
         volumes:
@@ -15,7 +15,7 @@ services:
      container_name: nginx-server
      restart: unless-stopped
      ports:
-      - 88:80
+      - 80:80
      volumes:
       - ./laravel:/var/www/html
      environment:
diff --git a/src/docker/7.2/Dockerfile b/src/docker/7.2/Dockerfile
index 861b28c..d8f0b5e 100644
--- a/src/docker/7.2/Dockerfile
+++ b/src/docker/7.2/Dockerfile
@@ -2,7 +2,7 @@ FROM php:7.2-fpm
 ARG WORKDIR=/var/www/html
 ENV DOCUMENT_ROOT=${WORKDIR}
 ENV LARAVEL_PROCS_NUMBER=1
-ENV NODE_MAJOR=18
+ENV NODE_VERSION=16.x
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
     git \
@@ -24,12 +24,9 @@ RUN apt-get update && apt-get install -y \
     nano \
     cron
 
-# Install Nodejs
-RUN apt-get update && apt-get install -y ca-certificates curl gnupg
-RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
-RUN apt-get update &&  apt-get install nodejs -y
-
+RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION} | bash -
+ # Install Node    
+RUN apt-get install -y nodejs
 # Clear cache
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 # Install Kafka 
diff --git a/src/docker/7.3/Dockerfile b/src/docker/7.3/Dockerfile
index 585c45b..9477483 100644
--- a/src/docker/7.3/Dockerfile
+++ b/src/docker/7.3/Dockerfile
@@ -2,7 +2,7 @@ FROM php:7.3-fpm
 ARG WORKDIR=/var/www/html
 ENV DOCUMENT_ROOT=${WORKDIR}
 ENV LARAVEL_PROCS_NUMBER=1
-ENV NODE_MAJOR=18
+ENV NODE_VERSION=16.x
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
     git \
@@ -23,12 +23,9 @@ RUN apt-get update && apt-get install -y \
     sqlite3  \
     nano \
     cron
-# Install Nodejs
-RUN apt-get update && apt-get install -y ca-certificates curl gnupg
-RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
-RUN apt-get update &&  apt-get install nodejs -y
-
+RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION} | bash -
+ # Install Node    
+RUN apt-get install -y nodejs
 # Clear cache
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 # Install Kafka 
diff --git a/src/docker/7.4/Dockerfile b/src/docker/7.4/Dockerfile
index c20b6ff..58ba3a2 100644
--- a/src/docker/7.4/Dockerfile
+++ b/src/docker/7.4/Dockerfile
@@ -2,7 +2,7 @@ FROM php:7.4-fpm
 ARG WORKDIR=/var/www/html
 ENV DOCUMENT_ROOT=${WORKDIR}
 ENV LARAVEL_PROCS_NUMBER=1
-ENV NODE_MAJOR=18
+ENV NODE_VERSION=16.x
 ARG HOST_UID=1000
 ENV USER=www-data
 # Install system dependencies
@@ -26,12 +26,9 @@ RUN apt-get update && apt-get install -y \
     nano \
     cron
 
-# Install Nodejs
-RUN apt-get update && apt-get install -y ca-certificates curl gnupg
-RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
-RUN apt-get update &&  apt-get install nodejs -y
-
+RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION} | bash -
+ # Install Node    
+RUN apt-get install -y nodejs
 # Clear cache
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 # Install Kafka 
diff --git a/src/docker/8.0/Dockerfile b/src/docker/8.0/Dockerfile
index 203a17e..ecd27bf 100644
--- a/src/docker/8.0/Dockerfile
+++ b/src/docker/8.0/Dockerfile
@@ -2,7 +2,7 @@ FROM php:8.0-fpm
 ARG WORKDIR=/var/www/html
 ENV DOCUMENT_ROOT=${WORKDIR}
 ENV LARAVEL_PROCS_NUMBER=1
-ENV NODE_MAJOR=18
+ENV NODE_VERSION=16.x
 ARG HOST_UID=1000
 ENV USER=www-data
 # Install system dependencies
@@ -25,11 +25,9 @@ RUN apt-get update && apt-get install -y \
     sqlite3  \
     nano \
     cron
-# Install Nodejs
-RUN apt-get update && apt-get install -y ca-certificates curl gnupg
-RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
-RUN apt-get update &&  apt-get install nodejs -y
+RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION} | bash -
+ # Install Node    
+RUN apt-get install -y nodejs
 
 # Clear cache
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*
diff --git a/src/docker/8.1/Dockerfile b/src/docker/8.1/Dockerfile
index 641e7bc..d8bd868 100644
--- a/src/docker/8.1/Dockerfile
+++ b/src/docker/8.1/Dockerfile
@@ -2,7 +2,7 @@ FROM php:8.1-fpm
 ARG WORKDIR=/var/www/html
 ENV DOCUMENT_ROOT=${WORKDIR}
 ENV LARAVEL_PROCS_NUMBER=1
-ENV NODE_MAJOR=18
+ENV NODE_VERSION=17.x
 ARG HOST_UID=1000
 ENV USER=www-data
 # Install system dependencies
@@ -26,11 +26,9 @@ RUN apt-get update && apt-get install -y \
     nano \
     cron
 
-# Install Nodejs
-RUN apt-get update && apt-get install -y ca-certificates curl gnupg
-RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
-RUN apt-get update &&  apt-get install nodejs -y
+RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION} | bash -
+ # Install Node    
+RUN apt-get install -y nodejs
 
 # Clear cache
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*