diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 06230c4..3c8f56e 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -28,7 +28,7 @@ jobs:
 
             tmpName="image-$RANDOM"
             docker build $folder --file $folder/Dockerfile --tag $tmpName --build-arg PHP_VERSION=$PHP_VERSION 
-            IMAGE_ID=${{ secrets.DOCKER_REGISTRY_URL }}/${{ secrets.IMAGE_NAME }}
+            IMAGE_ID=${{ secrets.DOCKER_REGISTRY_URL }}/${{ secrets.DOCKER_USERNAME }}/${{ secrets.IMAGE_NAME }}
 
             docker tag $tmpName $IMAGE_ID:$VERSION
             docker push $IMAGE_ID:$VERSION
diff --git a/README.md b/README.md
index 5df67ef..dbc3969 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# php-8-debain
-Docker image with php:8.3.x-bullseye
+# php-8-debian
+Docker image with php:8.3.x-bookworm
 
 All image contain following php extension and [composer](https://github.com/composer/composer).
 
@@ -28,20 +28,20 @@ All image contain following php extension and [composer](https://github.com/comp
 - xdebug(Only in cli and dev variant)
 
 ## Image Variants
-### php-8-debain:cli or php-8-debain:cli-{php-version}
+### php-8-debian:cli or php-8-debian:cli-{php-version}
 This use the cli base image with xdebug enabled, also contain nodejs-20.x and npm
 
-### php-8-debain:fpm or php-8-debain:fpm-{php-version}
+### php-8-debian:fpm or php-8-debian:fpm-{php-version}
 This use the fpm base image
 
-### php-8-debain:apache or php-8-debain:apache-{php-version}
+### php-8-debian:apache or php-8-debian:apache-{php-version}
 This use the apache base image
 
-### php-8-debain:dev or php-8-debain:dev-{php-version}
+### php-8-debian:dev or php-8-debian:dev-{php-version}
 This use the apache base image with xdebug enabled
 
-### php-8-debain:oci or php-8-debain:oci-{php-version}
+### php-8-debian:oci or php-8-debian:oci-{php-version}
 This use the fpm base image with oci8 extension enabled.
 
-### php-8-debain:supervisor or php-8-debain:supervisor-{php-version}
+### php-8-debian:supervisor or php-8-debian:supervisor-{php-version}
 This use the cli base image and set supervisor as entry point. Mount any supervisor config file as /etc/supervisor/conf.d/*.conf
diff --git a/apache/Dockerfile b/apache/Dockerfile
index ac0e987..6f0c03c 100644
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -1,5 +1,5 @@
 ARG PHP_VERSION=8.3.1
-FROM php:${PHP_VERSION}-apache-bullseye
+FROM php:${PHP_VERSION}-apache-bookworm
 
 LABEL org.opencontainers.image.authors="Roni Kumar Saha <roni.csed@gmail.com>"
 
diff --git a/cli/Dockerfile b/cli/Dockerfile
index 28d5070..9ac151f 100644
--- a/cli/Dockerfile
+++ b/cli/Dockerfile
@@ -1,5 +1,5 @@
 ARG PHP_VERSION=8.3.1
-FROM php:${PHP_VERSION}-cli-bullseye
+FROM php:${PHP_VERSION}-cli-bookworm
 
 LABEL org.opencontainers.image.authors="Roni Kumar Saha <roni.csed@gmail.com>"
 
diff --git a/dev/Dockerfile b/dev/Dockerfile
index 45e9bca..efafa0e 100644
--- a/dev/Dockerfile
+++ b/dev/Dockerfile
@@ -1,5 +1,5 @@
 ARG PHP_VERSION=8.3.1
-FROM php:${PHP_VERSION}-apache-bullseye
+FROM php:${PHP_VERSION}-apache-bookworm
 
 LABEL org.opencontainers.image.authors="Roni Kumar Saha <roni.csed@gmail.com>"
 
diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index 75e1c36..4043db3 100644
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -1,5 +1,5 @@
 ARG PHP_VERSION=8.3.1
-FROM php:${PHP_VERSION}-fpm-bullseye
+FROM php:${PHP_VERSION}-fpm-bookworm
 
 LABEL org.opencontainers.image.authors="Roni Kumar Saha <roni.csed@gmail.com>"
 
diff --git a/oci/Dockerfile b/oci/Dockerfile
index 0403bff..2882103 100644
--- a/oci/Dockerfile
+++ b/oci/Dockerfile
@@ -1,5 +1,5 @@
 ARG PHP_VERSION=8.3.1
-FROM php:${PHP_VERSION}-fpm-bullseye
+FROM php:${PHP_VERSION}-fpm-bookworm
 
 LABEL org.opencontainers.image.authors="Roni Kumar Saha <roni.csed@gmail.com>"
 
diff --git a/supervisor/Dockerfile b/supervisor/Dockerfile
index 7260d24..3eecfe8 100644
--- a/supervisor/Dockerfile
+++ b/supervisor/Dockerfile
@@ -1,5 +1,5 @@
 ARG PHP_VERSION=8.3.1
-FROM php:${PHP_VERSION}-cli-bullseye
+FROM php:${PHP_VERSION}-cli-bookworm
 
 LABEL org.opencontainers.image.authors="Roni Kumar Saha <roni.csed@gmail.com>"