diff --git a/conf.d/shore.co.il.conf b/conf.d/shore.co.il.conf
deleted file mode 100644
index 437a1da370e93778eefaf7805974bea691f3f727..0000000000000000000000000000000000000000
--- a/conf.d/shore.co.il.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-map $host $z_push { default z-push; }
-
-server {
-    listen      80;
-    listen      [::]:80;
-    server_name shore.co.il;
-    include     snippets/robots-allow-all.conf;
-    include     snippets/ads-txt.conf;
-    include     snippets/security-txt.conf;
-    location = /        { return 301 https://$host/blog/; }
-    location /repo/     {
-        root            /var/www/www.shore.co.il/;
-        autoindex       on;
-    }
-    include     snippets/redirect-https.conf;
-}
-
-server {
-    listen      443 ssl;
-    listen      [::]:443 ssl;
-    server_name shore.co.il;
-    include     snippets/robots-allow-all.conf;
-    include     snippets/ads-txt.conf;
-    include     snippets/security-txt.conf;
-    include     snippets/ssl.conf;
-    include     snippets/nextcloud-well-known.conf;
-    include     snippets/z-push.conf;
-
-    location = /        { return 301 https://www.shore.co.il/blog/; }
-    include     snippets/redirect-www.conf;
-}
diff --git a/conf.d/www.shore.co.il.conf b/conf.d/www.shore.co.il.conf
deleted file mode 100644
index cd62489e86e6a8b5cd63e7b590b35d7cf82a924d..0000000000000000000000000000000000000000
--- a/conf.d/www.shore.co.il.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-server {
-    listen              80;
-    listen              [::]:80;
-    server_name         www.shore.co.il;
-    include             snippets/robots-allow-all.conf;
-    include             snippets/ads-txt.conf;
-    include             snippets/security-txt.conf;
-    location = /        { return 301 https://$host/blog/; }
-    location /repo/     {
-        root            /var/www/www.shore.co.il/;
-        autoindex       on;
-    }
-    location /          { return 301 https://$host$request_uri; }
-}
-
-server {
-    listen                  443 ssl;
-    listen                  [::]:443 ssl;
-    server_name             www.shore.co.il;
-    include                 snippets/robots-allow-all.conf;
-    include                 snippets/ads-txt.conf;
-    include                 snippets/security-txt.conf;
-    include                 snippets/ssl.conf;
-    root                    /var/www/www.shore.co.il/;
-    error_page 404          /;
-
-    location /repo/         { autoindex on; }
-    location = /resume      { try_files $uri /resume/resume.html; }
-    location = /resume/     { index resume.html; }
-
-    location = /            { return 301 https://$host/blog/; }
-    location /about         { return 301 https://$host/blog/pages/about-me.html; }
-    location /spam          { return 301 https://$host/blog/pages/spam.html; }
-    location = /blog        {
-        try_files $uri /blog/index.html;
-        charset UTF-8;
-    }
-
-    location /cgit          { return 301 https://git.shore.co.il/explore; }
-    location /cgit/         { return 301 https://git.shore.co.il/explore; }
-    location /git           { return 301 https://git.shore.co.il/explore; }
-    location /git/          { return 301 https://git.shore.co.il/explore; }
-}
diff --git a/docker-compose.yml b/docker-compose.yml
index e50d9f94908b2ded41082fc3382a943db8b62ffb..37dbac92ada382ef03439d8929d4adb3010c4df4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,13 +5,14 @@ services:
     build:
       context: ./
     # command: ["nginx", "-g", "daemon off;"]
-    hostname: &hostname "${HOSTNAME}"
+    hostname: &hostname nextcloud.shore.co.il
     networks:
       default:
         aliases:
-          - *hostname
           - nextcloud.shore.co.il
           - git.shore.co.il
+          - lam.shore.co.il
+          - mta-sts.shore.co.il
     ports:
       - '80:80'
       - '443:443'
diff --git a/snippets/z-push.conf b/snippets/z-push.conf
deleted file mode 100644
index 85a21d6b1f3a1ec8f2ee0c14e23ad8608663c46c..0000000000000000000000000000000000000000
--- a/snippets/z-push.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-location /AutoDiscover/ {
-    proxy_pass          http://$z_push$request_uri;
-    include             snippets/proxy-headers.conf;
-}
-
-location /Autodiscover/ {
-    proxy_pass          http://$z_push$request_uri;
-    include             snippets/proxy-headers.conf;
-}
-
-location /autodiscover/ {
-    proxy_pass          http://$z_push$request_uri;
-    include             snippets/proxy-headers.conf;
-}
-
-location /Microsoft-Server-ActiveSync {
-    proxy_pass          http://$z_push$request_uri;
-    include             snippets/proxy-headers.conf;
-}
diff --git a/www/www.shore.co.il/google88c23a5c89fa3cb3.html b/www/www.shore.co.il/google88c23a5c89fa3cb3.html
deleted file mode 100644
index ceace0b5e9d1937c18b05816d6ec871e20bb5afa..0000000000000000000000000000000000000000
--- a/www/www.shore.co.il/google88c23a5c89fa3cb3.html
+++ /dev/null
@@ -1 +0,0 @@
-google-site-verification: google88c23a5c89fa3cb3.html
\ No newline at end of file