diff --git a/Dockerfiles/couchpotato/Dockerfile b/Dockerfiles/couchpotato/Dockerfile
deleted file mode 100644
index b4ebe86..0000000
--- a/Dockerfiles/couchpotato/Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM lsiobase/alpine.python:3.6
-MAINTAINER fromenje
-
-# set python to use utf-8 rather than ascii.
-ENV PYTHONIOENCODING="UTF-8"
-
-# install app
-RUN \
- git clone --depth 1 https://github.com/CouchPotato/CouchPotatoServer /app/couchpotato
-
-# add local files
-COPY root/ /
-
-# ports and volumes
-EXPOSE 5050
-WORKDIR /app/couchpotato
-VOLUME /config /downloads /movies
diff --git a/Dockerfiles/couchpotato/root/etc/cont-init.d/30-config b/Dockerfiles/couchpotato/root/etc/cont-init.d/30-config
deleted file mode 100755
index 1cbb72b..0000000
--- a/Dockerfiles/couchpotato/root/etc/cont-init.d/30-config
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# create folders
-mkdir -p \
-	/var/log/couchpotato
-
-# permissions
-chown -R abc:abc \
-	/app
-
-chmod 777 \
-	/var/log/couchpotato
diff --git a/Dockerfiles/couchpotato/root/etc/services.d/couchpotato/run b/Dockerfiles/couchpotato/root/etc/services.d/couchpotato/run
deleted file mode 100755
index 58f2dfc..0000000
--- a/Dockerfiles/couchpotato/root/etc/services.d/couchpotato/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-UMASK_SET=${UMASK_SET:-022}
-umask "$UMASK_SET"
-
-exec \
-	s6-setuidgid abc python /app/couchpotato/CouchPotato.py \
-	--config_file=/config/CouchPotato/config.ini --data_dir=/config/CouchPotato/data
diff --git a/Dockerfiles/sonarr/Dockerfile b/Dockerfiles/sonarr/Dockerfile
index de1b34b..5bb64ec 100644
--- a/Dockerfiles/sonarr/Dockerfile
+++ b/Dockerfiles/sonarr/Dockerfile
@@ -1,19 +1,18 @@
 FROM buildpack-deps:xenial-scm
 MAINTAINER Jean Froment <froment.je@gmail.com>
 
-# Get latest path for Jackett
-RUN jack_tag=$(curl -sX GET "https://api.github.com/repos/Jackett/Jackett/releases/latest" \
-    | awk '/tag_name/{print $4;exit}' FS='[""]') \
-
 # Install Sonarr, S6, and Jackett
-    && echo "deb http://apt.sonarr.tv/ master main" \
-            > /etc/apt/sources.list.d/sonarr.list \
+RUN echo "deb http://apt.sonarr.tv/ master main" \
+        > /etc/apt/sources.list.d/sonarr.list \
+    && echo "deb http://download.mono-project.com/repo/ubuntu xenial main" \
+        > /etc/apt/sources.list.d/mono.list \
     && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys FDA5DFFC \
+    && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF \
     && apt-get update \
-    && apt-get install -y nzbdrone libcurl4-openssl-dev mono-devel \
+    && apt-get install -y mono-complete nzbdrone libcurl4-openssl-dev \
     && curl -sL "https://github.com/just-containers/s6-overlay/releases/download/v1.18.1.5/s6-overlay-amd64.tar.gz" \
         | tar xz -C / \
-    && curl -sL "https://github.com/Jackett/Jackett/releases/download/$jack_tag/Jackett.Binaries.Mono.tar.gz" \
+    && curl -sL $(curl -sL https://api.github.com/repos/Jackett/Jackett/releases | grep browser_download_url | grep Mono | head -n 1 | cut -d '"' -f 4) \
         | tar xz -C /opt \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
diff --git a/build-all.sh b/build-all.sh
index fd291c6..c0ee3f4 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -27,6 +27,6 @@ docker build -t fromenje/seedbox:plex         $ARGS Dockerfiles/plex        &
 docker build -t fromenje/seedbox:deluge       $ARGS Dockerfiles/deluge      &
 docker build -t fromenje/seedbox:sonarr	      $ARGS Dockerfiles/sonarr	    &
 docker build -t fromenje/seedbox:h5ai	        $ARGS Dockerfiles/h5ai	      &
-docker build -t fromenje/seedbox:couchpotato  $ARGS Dockerfiles/couchpotato &
+docker build -t fromenje/seedbox:radarr       $ARGS Dockerfiles/radarr      &
 
 wait
diff --git a/docker-compose.yml b/docker-compose.yml
index 87ef1a7..a956f2d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,14 +12,6 @@ volumes:
         driver: local-persist
         driver_opts:
             mountpoint: /data/torrents
-    downloads:
-        driver: local-persist
-        driver_opts:
-            mountpoint: /data/torrents/deluge
-    movies:
-        driver: local-persist
-        driver_opts:
-            mountpoint: /data/torrents/Movies
 
 services:
     frontend:
@@ -86,23 +78,6 @@ services:
         environment:
             - TZ=Europe/Paris
 
-    couchpotato:
-        image: fromenje/seedbox:couchpotato
-        build: Dockerfiles/couchpotato
-        restart: always
-        networks:
-            - main
-        volumes:
-            - config:/config
-            - downloads:/downloads
-            - movies:/movies
-        env_file:
-            - config
-        environment:
-            - PGID=0
-            - PUID=0
-            - TZ=Europe/Paris
-
     radarr:
        image: fromenje/seedbox:radarr
        build: Dockerfiles/radarr
diff --git a/push-images.sh b/push-images.sh
index 3ac2978..864ebd3 100755
--- a/push-images.sh
+++ b/push-images.sh
@@ -7,4 +7,4 @@ docker push fromenje/seedbox:plex
 docker push fromenje/seedbox:sonarr
 docker push fromenje/seedbox:deluge
 docker push fromenje/seedbox:h5ai
-docker push fromenje/seedbox:couchpotato
+docker push fromenje/seedbox:radarr