diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index eb28434..ad1c6e6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,28 +1,15 @@
-name: Docker image build and Push Image to registry
-
+name: Build
 on:
   push:
     branches:
-      - '**'
+      - master
 
 env:
-  #BRANCH_NAME: ${{ github.head_ref || github.ref_name }} 
   BUILDKIT_IMAGE: jkaninda/laravel-php-fpm
 jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      - 
-        name: Set environment for branch
-        run: |
-          set -x
-          if [[ $GITHUB_REF == 'refs/heads/master' ]]; then
-            echo "TAG_NAME=latest" >> "$GITHUB_ENV"
-            echo "runs-on: master branch"
-          else
-            echo "TAG_NAME=${{ github.head_ref || github.ref_name }}" >> "$GITHUB_ENV"
-            echo "runs-on: ${{ github.head_ref || github.ref_name }} branch"
-          fi
       - 
         name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -36,8 +23,32 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
-        name: Build and push
+        name: Build and push 7.4
         uses: docker/build-push-action@v3
         with:
+          file: "./docker/7.4/Dockerfile"
           push: true
-          tags: "${{env.BUILDKIT_IMAGE}}:${{env.TAG_NAME}}"
\ No newline at end of file
+          tags: "${{env.BUILDKIT_IMAGE}}:7.4"
+      -
+        name: Build and push 8.0
+        uses: docker/build-push-action@v3
+        with:
+          file: "./docker/8.0/Dockerfile"
+          push: true
+          tags: "${{env.BUILDKIT_IMAGE}}:8.0"
+      -
+        name: Build and push 8.1
+        uses: docker/build-push-action@v3
+        with:
+          file: "./docker/8.1/Dockerfile"
+          push: true
+          tags: "${{env.BUILDKIT_IMAGE}}:8.1"
+      -
+        name: Build and push 8.2
+        uses: docker/build-push-action@v3
+        with:
+          file: "./docker/8.2/Dockerfile"
+          push: true
+          tags: |
+           "${{env.BUILDKIT_IMAGE}}:8.2"
+           "${{env.BUILDKIT_IMAGE}}:latest"
\ No newline at end of file
diff --git a/build.sh b/build.sh
index 7c5e7e9..2181309 100755
--- a/build.sh
+++ b/build.sh
@@ -1,9 +1,17 @@
-#!/usr/bin/env bash
+#!/bin/bash
 if [ $# -eq 0 ]
   then
     tag='latest'
   else
     tag=$1
 fi
+if [ $tag != 'latest' ]
+then
+  echo 'Build from from tag'
+  docker build -f docker/${tag}/Dockerfile -t jkaninda/laravel-php-fpm:$tag .
+else
+ echo 'Build latest'
+ docker build -f docker/8.2/Dockerfile -t jkaninda/laravel-php-fpm:$tag .
+ 
+fi
 
-docker build -t jkaninda/laravel-php-fpm:$tag .
diff --git a/Dockerfile b/docker/7.2/Dockerfile
similarity index 95%
rename from Dockerfile
rename to docker/7.2/Dockerfile
index 4e91e11..09b6127 100644
--- a/Dockerfile
+++ b/docker/7.2/Dockerfile
@@ -1,8 +1,8 @@
-FROM php:8.1.11-fpm
+FROM php:7.2-fpm
 ARG WORKDIR=/var/www/html
 ENV DOCUMENT_ROOT=${WORKDIR}
 ENV LARAVEL_PROCS_NUMBER=1
-ENV NODE_VERSION=17.x
+ENV NODE_VERSION=16.x
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
     git \
@@ -43,7 +43,7 @@ RUN docker-php-ext-enable rdkafka \
     && rm -rf /php-rdkafka
 
 # Install PHP extensions zip, mbstring, exif, bcmath, intl
-RUN docker-php-ext-configure gd --with-freetype --with-jpeg
+RUN docker-php-ext-configure gd
 RUN docker-php-ext-install  zip mbstring exif pcntl bcmath -j$(nproc) gd intl
 
 # Install Redis and enable it
diff --git a/docker/7.4/Dockerfile b/docker/7.4/Dockerfile
new file mode 100644
index 0000000..06ea974
--- /dev/null
+++ b/docker/7.4/Dockerfile
@@ -0,0 +1,93 @@
+FROM php:7.4-fpm
+ARG WORKDIR=/var/www/html
+ENV DOCUMENT_ROOT=${WORKDIR}
+ENV LARAVEL_PROCS_NUMBER=1
+ENV NODE_VERSION=16.x
+ARG HOST_UID=1000
+ENV USER=www-data
+# Install system dependencies
+RUN apt-get update && apt-get install -y \
+    git \
+    curl \
+    libfreetype6-dev \
+    libjpeg62-turbo-dev \
+    libmemcached-dev \
+    libzip-dev \
+    libpng-dev \
+    libonig-dev \
+    libxml2-dev \
+    librdkafka-dev \
+    libpq-dev \
+    openssh-server \
+    zip \
+    unzip \
+    supervisor \
+    sqlite3  \
+    nano \
+    cron
+
+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 
+RUN git clone https://github.com/arnaud-lb/php-rdkafka.git\
+    && cd php-rdkafka \
+    && phpize \
+    && ./configure \
+    && make all -j 5 \
+    && make install 
+
+# Install Rdkafka and enable it
+RUN docker-php-ext-enable rdkafka \
+     && cd .. \
+    && rm -rf /php-rdkafka
+
+# Install PHP extensions zip, mbstring, exif, bcmath, intl
+RUN docker-php-ext-configure gd
+RUN docker-php-ext-install  zip mbstring exif pcntl bcmath -j$(nproc) gd intl
+
+# Install Redis and enable it
+RUN pecl install redis  && docker-php-ext-enable redis
+
+
+
+# Install the php memcached extension
+RUN pecl install memcached && docker-php-ext-enable memcached
+
+# Install the PHP pdo_mysql extention
+RUN docker-php-ext-install pdo_mysql
+
+# Install the PHP pdo_pgsql extention
+RUN docker-php-ext-install pdo_pgsql
+
+
+# Install Composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+# Set working directory
+WORKDIR $WORKDIR
+
+RUN rm -Rf /var/www/* && \
+mkdir -p /var/www/html
+
+ADD src/index.php $WORKDIR/index.php
+ADD src/php.ini $PHP_INI_DIR/conf.d/
+ADD src/supervisor/supervisord.conf /etc/supervisor/supervisord.conf
+
+COPY ./entrypoint.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/entrypoint.sh
+RUN ln -s /usr/local/bin/entrypoint.sh /
+
+ENTRYPOINT ["entrypoint.sh"]
+
+
+
+RUN usermod -u ${HOST_UID} www-data
+RUN groupmod -g ${HOST_UID} www-data
+
+RUN chmod -R 755 $WORKDIR
+RUN chown -R www-data:www-data $WORKDIR
+EXPOSE 9000
+CMD [ "entrypoint" ]
diff --git a/docker/8.0/Dockerfile b/docker/8.0/Dockerfile
new file mode 100644
index 0000000..862b394
--- /dev/null
+++ b/docker/8.0/Dockerfile
@@ -0,0 +1,93 @@
+FROM php:8.0-fpm
+ARG WORKDIR=/var/www/html
+ENV DOCUMENT_ROOT=${WORKDIR}
+ENV LARAVEL_PROCS_NUMBER=1
+ENV NODE_VERSION=16.x
+ARG HOST_UID=1000
+ENV USER=www-data
+# Install system dependencies
+RUN apt-get update && apt-get install -y \
+    git \
+    curl \
+    libfreetype6-dev \
+    libjpeg62-turbo-dev \
+    libmemcached-dev \
+    libzip-dev \
+    libpng-dev \
+    libonig-dev \
+    libxml2-dev \
+    librdkafka-dev \
+    libpq-dev \
+    openssh-server \
+    zip \
+    unzip \
+    supervisor \
+    sqlite3  \
+    nano \
+    cron
+
+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 
+RUN git clone https://github.com/arnaud-lb/php-rdkafka.git\
+    && cd php-rdkafka \
+    && phpize \
+    && ./configure \
+    && make all -j 5 \
+    && make install 
+
+# Install Rdkafka and enable it
+RUN docker-php-ext-enable rdkafka \
+     && cd .. \
+    && rm -rf /php-rdkafka
+
+# Install PHP extensions zip, mbstring, exif, bcmath, intl
+RUN docker-php-ext-configure gd --with-freetype --with-jpeg
+RUN docker-php-ext-install  zip mbstring exif pcntl bcmath -j$(nproc) gd intl
+
+# Install Redis and enable it
+RUN pecl install redis  && docker-php-ext-enable redis
+
+
+
+# Install the php memcached extension
+RUN pecl install memcached && docker-php-ext-enable memcached
+
+# Install the PHP pdo_mysql extention
+RUN docker-php-ext-install pdo_mysql
+
+# Install the PHP pdo_pgsql extention
+RUN docker-php-ext-install pdo_pgsql
+
+
+# Install Composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+# Set working directory
+WORKDIR $WORKDIR
+
+RUN rm -Rf /var/www/* && \
+mkdir -p /var/www/html
+
+ADD src/index.php $WORKDIR/index.php
+ADD src/php.ini $PHP_INI_DIR/conf.d/
+ADD src/supervisor/supervisord.conf /etc/supervisor/supervisord.conf
+
+COPY ./entrypoint.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/entrypoint.sh
+RUN ln -s /usr/local/bin/entrypoint.sh /
+
+ENTRYPOINT ["entrypoint.sh"]
+
+
+
+RUN usermod -u ${HOST_UID} www-data
+RUN groupmod -g ${HOST_UID} www-data
+
+RUN chmod -R 755 $WORKDIR
+RUN chown -R www-data:www-data $WORKDIR
+EXPOSE 9000
+CMD [ "entrypoint" ]
diff --git a/docker/8.1/Dockerfile b/docker/8.1/Dockerfile
new file mode 100644
index 0000000..a1f8223
--- /dev/null
+++ b/docker/8.1/Dockerfile
@@ -0,0 +1,92 @@
+FROM php:8.1.13-fpm
+ARG WORKDIR=/var/www/html
+ENV DOCUMENT_ROOT=${WORKDIR}
+ENV LARAVEL_PROCS_NUMBER=1
+ENV NODE_VERSION=17.x
+ARG HOST_UID=1000
+ENV USER=www-data
+# Install system dependencies
+RUN apt-get update && apt-get install -y \
+    git \
+    curl \
+    libfreetype6-dev \
+    libjpeg62-turbo-dev \
+    libmemcached-dev \
+    libzip-dev \
+    libpng-dev \
+    libonig-dev \
+    libxml2-dev \
+    librdkafka-dev \
+    libpq-dev \
+    openssh-server \
+    zip \
+    unzip \
+    supervisor \
+    sqlite3  \
+    nano \
+    cron
+
+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 
+RUN git clone https://github.com/arnaud-lb/php-rdkafka.git\
+    && cd php-rdkafka \
+    && phpize \
+    && ./configure \
+    && make all -j 5 \
+    && make install 
+
+# Install Rdkafka and enable it
+RUN docker-php-ext-enable rdkafka \
+     && cd .. \
+    && rm -rf /php-rdkafka
+
+# Install PHP extensions zip, mbstring, exif, bcmath, intl
+RUN docker-php-ext-configure gd --with-freetype --with-jpeg
+RUN docker-php-ext-install  zip mbstring exif pcntl bcmath -j$(nproc) gd intl
+
+# Install Redis and enable it
+RUN pecl install redis  && docker-php-ext-enable redis
+
+
+
+# Install the php memcached extension
+RUN pecl install memcached && docker-php-ext-enable memcached
+
+# Install the PHP pdo_mysql extention
+RUN docker-php-ext-install pdo_mysql
+
+# Install the PHP pdo_pgsql extention
+RUN docker-php-ext-install pdo_pgsql
+
+
+# Install Composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+# Set working directory
+WORKDIR $WORKDIR
+
+RUN rm -Rf /var/www/* && \
+mkdir -p /var/www/html
+
+ADD src/index.php $WORKDIR/index.php
+ADD src/php.ini $PHP_INI_DIR/conf.d/
+ADD src/supervisor/supervisord.conf /etc/supervisor/supervisord.conf
+
+COPY ./entrypoint.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/entrypoint.sh
+RUN ln -s /usr/local/bin/entrypoint.sh /
+
+ENTRYPOINT ["entrypoint.sh"]
+
+
+RUN usermod -u ${HOST_UID} www-data
+RUN groupmod -g ${HOST_UID} www-data
+
+RUN chmod -R 755 $WORKDIR
+RUN chown -R www-data:www-data $WORKDIR
+EXPOSE 9000
+CMD [ "entrypoint" ]
diff --git a/docker/8.2/Dockerfile b/docker/8.2/Dockerfile
new file mode 100644
index 0000000..f6463b9
--- /dev/null
+++ b/docker/8.2/Dockerfile
@@ -0,0 +1,93 @@
+FROM php:8.2.0-fpm
+ARG WORKDIR=/var/www/html
+ENV DOCUMENT_ROOT=${WORKDIR}
+ENV LARAVEL_PROCS_NUMBER=1
+ENV NODE_VERSION=17.x
+ARG HOST_UID=1000
+ENV USER=www-data
+# Install system dependencies
+RUN apt-get update && apt-get install -y \
+    git \
+    curl \
+    libfreetype6-dev \
+    libjpeg62-turbo-dev \
+    libmemcached-dev \
+    libzip-dev \
+    libpng-dev \
+    libonig-dev \
+    libxml2-dev \
+    librdkafka-dev \
+    libpq-dev \
+    openssh-server \
+    zip \
+    unzip \
+    supervisor \
+    sqlite3  \
+    nano \
+    cron
+
+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 
+RUN git clone https://github.com/arnaud-lb/php-rdkafka.git\
+    && cd php-rdkafka \
+    && phpize \
+    && ./configure \
+    && make all -j 5 \
+    && make install 
+
+# Install Rdkafka and enable it
+RUN docker-php-ext-enable rdkafka \
+     && cd .. \
+    && rm -rf /php-rdkafka
+
+# Install PHP extensions zip, mbstring, exif, bcmath, intl
+RUN docker-php-ext-configure gd --with-freetype --with-jpeg
+RUN docker-php-ext-install  zip mbstring exif pcntl bcmath -j$(nproc) gd intl
+
+# Install Redis and enable it
+RUN pecl install redis  && docker-php-ext-enable redis
+
+
+
+# Install the php memcached extension
+RUN pecl install memcached && docker-php-ext-enable memcached
+
+# Install the PHP pdo_mysql extention
+RUN docker-php-ext-install pdo_mysql
+
+# Install the PHP pdo_pgsql extention
+RUN docker-php-ext-install pdo_pgsql
+
+
+# Install Composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+# Set working directory
+WORKDIR $WORKDIR
+
+RUN rm -Rf /var/www/* && \
+mkdir -p /var/www/html
+
+ADD src/index.php $WORKDIR/index.php
+ADD src/php.ini $PHP_INI_DIR/conf.d/
+ADD src/supervisor/supervisord.conf /etc/supervisor/supervisord.conf
+
+COPY ./entrypoint.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/entrypoint.sh
+RUN ln -s /usr/local/bin/entrypoint.sh /
+
+ENTRYPOINT ["entrypoint.sh"]
+
+
+
+RUN usermod -u ${HOST_UID} www-data
+RUN groupmod -g ${HOST_UID} www-data
+
+RUN chmod -R 755 $WORKDIR
+RUN chown -R www-data:www-data $WORKDIR
+EXPOSE 9000
+CMD [ "entrypoint" ]