diff --git a/roles/calibre-web/tasks/main.yml b/roles/calibre-web/tasks/main.yml
index 0df9c81f9..dd64f0a03 100644
--- a/roles/calibre-web/tasks/main.yml
+++ b/roles/calibre-web/tasks/main.yml
@@ -71,7 +71,7 @@
     mode: 0644
   with_items:
     - { src: 'calibre-web.service.j2', dest: '/etc/systemd/system/calibre-web.service' }
-    - { src: 'calibre-web-nginx.conf.j2', dest: '/etc/nginx/conf.d/calibre-web.conf' }
+    - { src: 'calibre-web-nginx.conf.j2', dest: '/etc/nginx/conf.d/calibre-web-nginx.conf' }
 
 - name: Does /library/calibre-web/metadata.db exist?
   stat:
@@ -119,9 +119,9 @@
 
 # Default: http://box/books
 # SEE ALSO: https://github.com/janeczku/calibre-web/wiki/Setup-Reverse-Proxy
-- name: Enable http://box{{ calibreweb_url1 }}, http://box{{ calibreweb_url2 }}, http://box{{ calibreweb_url3 }} with Apache
-  command: a2ensite calibre-web.conf
-  when: calibreweb_enabled | bool
+#- name: Enable http://box{{ calibreweb_url1 }}, http://box{{ calibreweb_url2 }}, http://box{{ calibreweb_url3 }} with Apache
+#  command: a2ensite calibre-web.conf
+#  when: calibreweb_enabled | bool
 
 #- name: Restart Apache after enabling calibre-web httpd2 site
 #  command: apachectl -k graceful
@@ -136,7 +136,7 @@
   when: not calibreweb_enabled | bool
 
 - name: Disable http://box{{ calibreweb_url1 }}, http://box{{ calibreweb_url2 }}, http://box{{ calibreweb_url3 }} with Apache
-  command: a2dissite calibre-web.conf
+  command: rm /etc/nginx/conf.d/calibre-web-nginx.conf
   when: not calibreweb_enabled
 
 #- name: Restart Apache after disabling calibre-web httpd2 site