diff --git a/.github/workflows/httpd-php-multiarch.yml b/.github/workflows/httpd-php-multiarch.yml
index 89a44e8..ee5a7c4 100644
--- a/.github/workflows/httpd-php-multiarch.yml
+++ b/.github/workflows/httpd-php-multiarch.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
 
 env:
-  GHCR_SLUG: ghcr.io/rodber/chevereto-free-httpd-php
+  GHCR_SLUG: ghcr.io/rodber/chevereto-free
 
 jobs:
   buildx:
diff --git a/UPGRADING.md b/UPGRADING.md
index e32f9ff..7553484 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -4,7 +4,7 @@ To keep the software updated you have to simply keep the application files updat
 
 * Using the built-in updater at `/dashboard` > Click **check for updates**
 * Downloading a [Release](https://github.com/rodber/chevereto-free/releases) and **Extract to** the application filesystem
-* (Docker) Re-creating the container based in our [updated image](https://github.com/rodber/chevereto-free/pkgs/container/chevereto-free-httpd-php)
+* (Docker) Re-creating the container based in our [updated image](https://github.com/rodber/chevereto-free/pkgs/container/chevereto-free)
 
 ## Upgrade to Paid
 
diff --git a/docs/BUILDING.md b/docs/BUILDING.md
index 2a57ddf..1c85b5a 100644
--- a/docs/BUILDING.md
+++ b/docs/BUILDING.md
@@ -6,16 +6,16 @@
 
 ## Docker build
 
-* **Tip:** Tag `ghcr.io/rodber/chevereto-free-httpd-php:1.6` to override the [ghcr package](https://github.com/rodber/chevereto-free/pkgs/container/chevereto-free-httpd-php) with local
+* **Tip:** Tag `ghcr.io/rodber/chevereto-free:1.6` to override the [ghcr package](https://github.com/rodber/chevereto-free/pkgs/container/chevereto-free) with local
 
 ```sh
-docker build -t ghcr.io/rodber/chevereto-free-httpd-php:1.6 . \
+docker build -t ghcr.io/rodber/chevereto-free:1.6 . \
     -f httpd-php.Dockerfile
 ```
 
 * For custom tag: Replace `tag` with your own.
 
 ```sh
-docker build -t rodber/chevereto-free-httpd-php:tag . \
+docker build -t rodber/chevereto-free:tag . \
     -f httpd-php.Dockerfile
 ```
diff --git a/httpd-php-dev.yml b/httpd-php-dev.yml
index a9dbf99..2827e48 100644
--- a/httpd-php-dev.yml
+++ b/httpd-php-dev.yml
@@ -17,7 +17,7 @@ services:
 
   app:
     container_name: chevereto-free-dev_app
-    image: ghcr.io/rodber/chevereto-free-httpd-php:1.6
+    image: ghcr.io/rodber/chevereto-free:1.6
     networks:
       - chevereto
     volumes:
diff --git a/httpd-php.yml b/httpd-php.yml
index 03d0e01..1c517ec 100644
--- a/httpd-php.yml
+++ b/httpd-php.yml
@@ -17,7 +17,7 @@ services:
 
   app:
     container_name: chevereto-free_app
-    image: ghcr.io/rodber/chevereto-free-httpd-php:1.6
+    image: ghcr.io/rodber/chevereto-free:1.6
     networks:
       - chevereto
     volumes: