diff --git a/README.md b/README.md
index 1995c062..5f8578f5 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Ansible config and a bunch of Docker containers.
 * A Docker host with Portainer for image and container management
 * An automatic dynamic DNS updater if you use Cloudflare to host your domain DNS
 * A Personal finance manager
-* eBook management with calibre-web
+* eBook management with Calibre-web
 * Content management with Joomla
 * A dual panel local file manager
 * Self-service media request web application
@@ -36,7 +36,7 @@ Ansible config and a bunch of Docker containers.
 * [Airsonic](https://airsonic.github.io/) - catalog and stream music
 * [Bazarr](https://github.com/morpheus65535/bazarr) - companion to Radarr and Sonarr for downloading subtitles
 * [Bitwarden_rs](https://github.com/dani-garcia/bitwarden_rs) - Self-Hosting port of password manager
-* [Calibre](https://hub.docker.com/r/linuxserver/calibre-web) - eBook Library
+* [Calibre-web](https://github.com/janeczku/calibre-web) - Provides a clean interface for browsing, reading and downloading eBooks using an existing Calibre database.
 * [Cloud Commander](https://cloudcmd.io/) - A dual panel file manager with integrated web console and text editor
 * [Cloudflare DDNS](https://hub.docker.com/r/joshuaavalon/cloudflare-ddns/) - automatically update Cloudflare with your IP address
 * [CouchPotato](https://couchpota.to/) - for downloading and managing movies
diff --git a/docs/applications/calibre.md b/docs/applications/calibre.md
index dd722448..5677334e 100644
--- a/docs/applications/calibre.md
+++ b/docs/applications/calibre.md
@@ -1,6 +1,6 @@
-# Calibre(-web) eBook Library
+# Calibre-web
 
-Homepage: [https://github.com/janeczku/calibre-web](https://github.com/linuxserver/docker-calibre-web)
+Homepage: [https://github.com/janeczku/calibre-web](https://github.com/janeczku/calibre-web)
 
 
 Calibre-Web is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database.
diff --git a/docs/configuration/application_ports.md b/docs/configuration/application_ports.md
index b64f3e67..e15810d7 100644
--- a/docs/configuration/application_ports.md
+++ b/docs/configuration/application_ports.md
@@ -8,7 +8,7 @@ By default, applications can be found on the ports listed below.
 | Bazarr          | 6767   |              |
 | Bitwarden "hub" | 3012   | Web Not.     |
 | Bitwarden       | 19080  | HTTP         |
-| Calibre         | 8084   | HTTP         |
+| Calibre-web     | 8084   | HTTP         |
 | Cloud Commander | 7373   |              |
 | Couchpotato     | 5050   |              |
 | Duplicati       | 8200   |              |
diff --git a/group_vars/all.yml b/group_vars/all.yml
index 784dc2d6..4df45c5e 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -832,7 +832,7 @@ mosquitto_port_a: "1883"
 mosquitto_port_b: "9001"
 
 ###
-### Calibre
+### Calibre-web
 ###
 calibre_available_externally: "false"
 calibre_data_directory: "{{ docker_home }}/calibre"
diff --git a/tasks/calibre.yml b/tasks/calibre.yml
index 321fe00d..e597f473 100644
--- a/tasks/calibre.yml
+++ b/tasks/calibre.yml
@@ -1,11 +1,11 @@
-- name: Create Calibre Directories
+- name: Create Calibre-web Directories
   file:
     path: "{{ item }}"
     state: directory
   with_items:
     - "{{ calibre_data_directory }}/config"
 
-- name: Calibre Docker Container
+- name: Calibre-web Docker Container
   docker_container:
     name: calibre
     image: linuxserver/calibre-web:latest
@@ -26,4 +26,4 @@
       traefik.frontend.rule: "Host:calibre.{{ ansible_nas_domain }}"
       traefik.enable: "{{ calibre_available_externally }}"
       traefik.port: "8083"
-    memory: 1g
\ No newline at end of file
+    memory: 1g