diff --git a/.gitignore b/.gitignore
index 7746492..a619da3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,6 @@ docker-compose.override.yml
 /adguardhome/work
 /sabnzbd
 /calibre-web
-/cleanuperr/*
-!/cleanuperr/blacklist.json
-!/cleanuperr/logs/.gitkeep
\ No newline at end of file
+/cleanuparr/*
+!/cleanuparr/blacklist.json
+!/cleanuparr/logs/.gitkeep
\ No newline at end of file
diff --git a/README.md b/README.md
index 4dcf6ce..053ccf7 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ I am running it in Ubuntu Server 22.04; I also tested this setup on a [Synology
 | [PIA WireGuard VPN](https://github.com/thrnz/docker-wireguard-pia) | Encapsulate qBittorrent traffic in [PIA](https://www.privateinternetaccess.com/) using [WireGuard](https://www.wireguard.com/) with port forwarding. | [thrnz/docker-wireguard-pia](https://hub.docker.com/r/thrnz/docker-wireguard-pia)        |                        |
 | [qBittorrent](https://www.qbittorrent.org)                         | Bittorrent client with a complete web UI<br/>Uses VPN network<br/>Using Libtorrent 1.x                                                               | [linuxserver/qbittorrent:libtorrentv1](https://hub.docker.com/r/linuxserver/qbittorrent) | /qbittorrent           |
 | [Unpackerr](https://unpackerr.zip)                                 | Automated Archive Extractions                                                                                                                        | [golift/unpackerr](https://hub.docker.com/r/golift/unpackerr)                            |                        |
-| [Cleanuperr](https://github.com/flmorg/cleanuperr)                 | Cleanuperr is a tool for automating the cleanup of unwanted or blocked files in Sonarr and Radarr.                                                   | [flmorg/cleanuperr](https://ghcr.io/flmorg/cleanuperr)                                   |                        |
+| [Cleanuparr](https://github.com/Cleanuparr/Cleanuparr)             | Cleanuparr is a tool for automating the cleanup of unwanted or blocked files in Sonarr and Radarr.                                                   | [cleanuparr/cleanuparr](https://ghcr.io/cleanuparr/cleanuparr)                           |                        |
 | [Jellyfin](https://jellyfin.org)                                   | Media server designed to organize, manage, and share digital media files to networked devices                                                        | [linuxserver/jellyfin](https://hub.docker.com/r/linuxserver/jellyfin)                    | /jellyfin              |
 | [Jellyseer](https://jellyfin.org)                                  | Manages requests for your media library                                                                                                              | [fallenbagel/jellyseerr](https://hub.docker.com/r/fallenbagel/jellyseerr)                | `$JELLYSEERR_HOSTNAME` |
 | [Homepage](https://gethomepage.dev)                                | Application dashboard                                                                                                                                | [gethomepage/homepage](https://github.com/gethomepage/homepage/pkgs/container/homepage)  | /                      |
diff --git a/docker-compose.yml b/docker-compose.yml
index b8c79d1..73664d6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -332,14 +332,14 @@ services:
       - UN_RADARR_0_API_KEY=${RADARR_API_KEY}
     security_opt:
       - no-new-privileges:true
-  cleanuperr:
-    image: ghcr.io/flmorg/cleanuperr:latest
-    container_name: cleanuperr
+  cleanuparr:
+    image: ghcr.io/cleanuparr/cleanuparr:latest
+    container_name: cleanuparr
     restart: always
     volumes:
-      - ${CONFIG_ROOT:-.}/cleanuperr/logs:/var/logs
-      - ${CONFIG_ROOT:-.}/cleanuperr/ignored.txt:/usr/ignored.txt
-      - ${CONFIG_ROOT:-.}/cleanuperr/blacklist.json:/usr/blacklist.json
+      - ${CONFIG_ROOT:-.}/cleanuparr/logs:/var/logs
+      - ${CONFIG_ROOT:-.}/cleanuparr/ignored.txt:/usr/ignored.txt
+      - ${CONFIG_ROOT:-.}/cleanuparr/blacklist.json:/usr/blacklist.json
     environment:
       - TZ=${TIMEZONE}
       - QUEUECLEANER__ENABLED=true