diff --git a/bicbucstriim/Dockerfile b/bicbucstriim/Dockerfile
deleted file mode 100644
index 148191e..0000000
--- a/bicbucstriim/Dockerfile
+++ /dev/null
@@ -1,51 +0,0 @@
-ARG BUILD_FROM
-FROM $BUILD_FROM
-
-ARG BUILD_VERSION
-ARG BUILD_ARCH
-# Add env
-ENV LANG C.UTF-8
-
-# Setup base
-
-RUN apk add --no-cache -U --virtual .build-deps \
-	wget \
-	unzip \
- && apk add -U --no-cache \
-        jq \
-	nginx \
-	php7 \
-	php7-cgi \
-	php7-ctype \
-	php7-dom \
-	php7-fpm \
-	php7-gd \
-	php7-intl \
-	php7-mcrypt \
-	php7-pdo_sqlite \
-	php7-session \
-	php7-xml \
-	sqlite \
- && BBS_VERSION=${BUILD_VERSION%-*} \
- && bbsurl=http://projekte.textmulch.de/bicbucstriim/downloads/BicBucStriim-${BBS_VERSION}.zip \
- && cd /tmp \
- && wget "$bbsurl" \
- && unzip BicBucStriim-${BBS_VERSION}.zip \
- && mkdir /var/www/bbs \
- && mv BicBucStriim-${BBS_VERSION}/* /var/www/bbs \
- && chmod -R ga+w /var/www/bbs/data \
- && apk del .build-deps \
- && rm -rf /tmp/BicBucStriim-* \
- && echo "daemon off;" >> /etc/nginx/nginx.conf \
- && rm /etc/nginx/conf.d/* \
- && mkdir -p /run/nginx
-
-# Copy data
-COPY run.sh /
-COPY bbs.conf /etc/nginx/conf.d/
-
-RUN chmod a+x /run.sh
-
-VOLUME /var/www/bbs/data
-
-CMD [ "/run.sh" ]
diff --git a/bicbucstriim/bbs.conf b/bicbucstriim/bbs.conf
deleted file mode 100644
index 6f3e12c..0000000
--- a/bicbucstriim/bbs.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-server {
-        listen       80;
-        server_name  localhost;
-        index        index.php;
-        root         /var/www/bbs/;
-        client_max_body_size 32M;
-
-	location / {
-        	rewrite ^/(img/.*)$ /$1 break;
-                rewrite ^/(js/.*)$ /$1 break;
-                rewrite ^/(style/.*)$ /$1 break;
-                rewrite ^/$ /index.php last;
-                rewrite ^/(admin|authors|authorslist|login|logout|metadata|search|series|serieslist|tags|tagslist|titles|titleslist|opds)/.*$ /index.php last;
- }
-
-        location ~ \.php$ {
-            try_files $uri =404;
-            fastcgi_split_path_info ^(.+\.php)(/.+)$;
-            fastcgi_pass localhost:9000;
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            fastcgi_index index.php;
-            include fastcgi_params;
-        }
-
-        location ~* ^.+\.(log|sqlite)$ {
-            return 404;
-        }
-
-        location ~ /\.ht {
-            return 404;
-        }
-
-        location ~* ^.+\.(ico|jpg|gif|png|css|js|svg|eot|ttf|woff|woff2|otf)$ {
-            log_not_found off;
-            expires 7d;
-            etag on;
-        }
-
-}
\ No newline at end of file
diff --git a/bicbucstriim/run.sh b/bicbucstriim/run.sh
deleted file mode 100644
index 5274278..0000000
--- a/bicbucstriim/run.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-set -e
-
-php-fpm7
-nginx
diff --git a/calibreweb/Dockerfile b/calibreweb/Dockerfile
new file mode 100644
index 0000000..318612f
--- /dev/null
+++ b/calibreweb/Dockerfile
@@ -0,0 +1,28 @@
+ARG BUILD_FROM
+FROM $BUILD_FROM
+
+ARG BUILD_VERSION
+ARG BUILD_ARCH
+# Add env
+ENV LANG C.UTF-8
+
+# Setup base
+
+RUN apk add --no-cache -U --virtual .build-deps \
+	git \
+ && apk add -U --no-cache \
+        jq \
+	py-pip \
+	python \
+	python-dev \
+ && mkdir /cw \
+ && cd /cw \
+ && git clone https://github.com/janeczku/calibre-web.git .\
+ && pip install -r requirements.txt --target vendor
+
+# Copy data
+COPY run.sh /
+
+RUN chmod a+x /run.sh
+
+CMD [ "/run.sh" ]
diff --git a/bicbucstriim/config.json b/calibreweb/config.json
similarity index 56%
rename from bicbucstriim/config.json
rename to calibreweb/config.json
index 979ebdf..2c0ee3b 100644
--- a/bicbucstriim/config.json
+++ b/calibreweb/config.json
@@ -1,14 +1,14 @@
 {
-    "name": "BicBucStriim",
+    "name": "Calibre Web",
     "version": "1.4.1",
-    "slug": "bicbucstriim",
-    "description": "BicBucStriim",
+    "slug": "calibre-web",
+    "description": "Calibre web",
     "url": "https://github.com/bestlibre/hassio-addons/tree/master/bicbucstriim",
     "startup": "after",
     "boot": "auto",
-    "image": "bestlibre/{arch}-bicbucstriim",
+    "image": "bestlibre/{arch}-calibre-web",
     "options": {},
     "schema": {},
-    "ports": {"80/tcp": null},
+    "ports": {"8083/tcp": null},
     "map": ["share:rw"]
 }
diff --git a/calibreweb/run.sh b/calibreweb/run.sh
new file mode 100644
index 0000000..c47b2a5
--- /dev/null
+++ b/calibreweb/run.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+python /cw/cps.py -p /data/cw.db