diff --git a/sites-available/api.kevinmidboe.conf b/sites-available/api.kevinmidboe.conf
index 2fe6403..cb56f73 100644
--- a/sites-available/api.kevinmidboe.conf
+++ b/sites-available/api.kevinmidboe.conf
@@ -5,8 +5,8 @@ server {
   listen [::]:443 ssl http2;
 
   server_name api.kevinmidboe.com;
-    ssl_certificate /etc/letsencrypt/live/api.kevinmidboe.com-0001/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/api.kevinmidboe.com-0001/privkey.pem; # managed by Certbot
+    ssl_certificate /etc/letsencrypt/live/api.kevinmidboe.com/fullchain.pem; # managed by Certbot
+    ssl_certificate_key /etc/letsencrypt/live/api.kevinmidboe.com/privkey.pem; # managed by Certbot
 
   location /files {
     alias /var/Www/public_files;
diff --git a/sites-available/elastic.conf b/sites-available/elastic.conf
index 06eb19a..0afbfd5 100644
--- a/sites-available/elastic.conf
+++ b/sites-available/elastic.conf
@@ -47,8 +47,8 @@ server {
     more_set_headers 'X-Upstream: $upstream_addr';
   }
 
-  ssl_certificate /etc/letsencrypt/live/elastic.schleppe.cloud-0001/fullchain.pem; # managed by Certbot
-  ssl_certificate_key /etc/letsencrypt/live/elastic.schleppe.cloud-0001/privkey.pem; # managed by Certbot
+  ssl_certificate /etc/letsencrypt/live/elastic.schleppe.cloud/fullchain.pem; # managed by Certbot
+  ssl_certificate_key /etc/letsencrypt/live/elastic.schleppe.cloud/privkey.pem; # managed by Certbot
 
 }
 
@@ -65,8 +65,8 @@ server {
     more_set_headers 'X-Upstream: $upstream_addr';
   }
 
-  ssl_certificate /etc/letsencrypt/live/elastic.schleppe.cloud/fullchain.pem; # managed by Certbot
-  ssl_certificate_key /etc/letsencrypt/live/elastic.schleppe.cloud/privkey.pem; # managed by Certbot
+  ssl_certificate /etc/letsencrypt/live/es.schleppe.cloud/fullchain.pem; # managed by Certbot
+  ssl_certificate_key /etc/letsencrypt/live/es.schleppe.cloud/privkey.pem; # managed by Certbot
 }
 
 
@@ -83,6 +83,6 @@ server {
     more_set_headers 'X-Upstream $upstream_addr';
   }
 
-  ssl_certificate /etc/letsencrypt/live/elastic.kevinmidboe.com-0001/fullchain.pem; # managed by Certbot
+  ssl_certificate /etc/letsencrypt/live/elastic.kevinmidboe.com/fullchain.pem; # managed by Certbot
   ssl_certificate_key /etc/letsencrypt/live/elastic.kevinmidboe.com-0001/privkey.pem; # managed by Certbot
 }
diff --git a/sites-available/hitler.conf b/sites-available/hitler.conf
index c6241bd..0222012 100644
--- a/sites-available/hitler.conf
+++ b/sites-available/hitler.conf
@@ -20,8 +20,8 @@ server {
     proxy_set_header Host $host;
     proxy_pass http://10.0.0.66:8080;
   }
-    ssl_certificate /etc/letsencrypt/live/hitler.kevinmidboe.com-0001/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/hitler.kevinmidboe.com-0001/privkey.pem; # managed by Certbot
+    ssl_certificate /etc/letsencrypt/live/hitler.kevinmidboe.com/fullchain.pem; # managed by Certbot
+    ssl_certificate_key /etc/letsencrypt/live/hitler.kevinmidboe.com/privkey.pem; # managed by Certbot
 
 
 }
diff --git a/sites-available/kevinmidboe.conf b/sites-available/kevinmidboe.conf
index 718f8ae..d7b805f 100644
--- a/sites-available/kevinmidboe.conf
+++ b/sites-available/kevinmidboe.conf
@@ -72,6 +72,6 @@ server {
   #   index index.html;
   # }
 
-  ssl_certificate /etc/letsencrypt/live/kevinmidboe.com-0001/fullchain.pem; # managed by Certbot
-  ssl_certificate_key /etc/letsencrypt/live/kevinmidboe.com-0001/privkey.pem; # managed by Certbot
+  ssl_certificate /etc/letsencrypt/live/kevinmidboe.com/fullchain.pem; # managed by Certbot
+  ssl_certificate_key /etc/letsencrypt/live/kevinmidboe.com/privkey.pem; # managed by Certbot
 }
diff --git a/sites-available/leifsopplevelser.conf b/sites-available/leifsopplevelser.conf
index 5296c5c..1f0914d 100644
--- a/sites-available/leifsopplevelser.conf
+++ b/sites-available/leifsopplevelser.conf
@@ -13,48 +13,47 @@ server {
 }
 
 server {
-	listen 443 ssl http2;
-	listen [::]:443 ssl http2;
-
-	server_name api.leifsopplevelser.no;
-
-	location / {
-		proxy_pass http://localhost:30021;
-	}
-
-	ssl_certificate /etc/letsencrypt/live/vinlottis.no-0001/fullchain.pem; # managed by Certbot
-	ssl_certificate_key /etc/letsencrypt/live/vinlottis.no-0001/privkey.pem; # managed by Certbot
+  listen 443 ssl http2;
+  listen [::]:443 ssl http2;
+  
+  server_name api.leifsopplevelser.no;
+  
+  location / {
+    proxy_pass http://localhost:30021;
+  }
+  
+  ssl_certificate /etc/letsencrypt/live/leifsopplevelser.no/fullchain.pem; # managed by Certbot
+  ssl_certificate_key /etc/letsencrypt/live/leifsopplevelser.no/privkey.pem; # managed by Certbot
 }
 
 server {
-	listen 443 ssl http2;
-	listen [::]:443 ssl http2;
+  listen 443 ssl http2;
+  listen [::]:443 ssl http2;
 
-	server_name upload.leifsopplevelser.no;
+  server_name upload.leifsopplevelser.no;
 
-	location / {
-		proxy_pass http://localhost:30022;  
-	}
+  location / {
+    proxy_pass http://localhost:30022;  
+  }
 
-	ssl_certificate /etc/letsencrypt/live/vinlottis.no-0001/fullchain.pem; # managed by Certbot
-	ssl_certificate_key /etc/letsencrypt/live/vinlottis.no-0001/privkey.pem; # managed by Certbot
+  ssl_certificate /etc/letsencrypt/live/leifsopplevelser.no/fullchain.pem; # managed by Certbot
+  ssl_certificate_key /etc/letsencrypt/live/leifsopplevelser.no/privkey.pem; # managed by Certbot
 }
 
 
 server {
-	listen 443 ssl http2;
-	listen [::]:443 ssl http2;
+  listen 443 ssl http2;
+  listen [::]:443 ssl http2;
+  server_name leifsopplevelser.no;
 
-	server_name leifsopplevelser.no;
+  location /assets {
+    root /home/kevin/leifs-image-processor;
+  }
 
-	location /assets {
-		root /home/kevin/leifs-image-processor;
-	}
+  location / {
+    proxy_pass http://localhost:30020;
+  }
 
-	location / {
-		proxy_pass http://localhost:30020;
-	}
-
-	ssl_certificate /etc/letsencrypt/live/vinlottis.no-0001/fullchain.pem; # managed by Certbot
-	ssl_certificate_key /etc/letsencrypt/live/vinlottis.no-0001/privkey.pem; # managed by Certbot
+  ssl_certificate /etc/letsencrypt/live/leifsopplevelser.no/fullchain.pem; # managed by Certbot
+  ssl_certificate_key /etc/letsencrypt/live/leifsopplevelser.no/privkey.pem; # managed by Certbot
 }
diff --git a/sites-available/lottis.conf b/sites-available/lottis.conf
index 3638be4..dcf93a9 100644
--- a/sites-available/lottis.conf
+++ b/sites-available/lottis.conf
@@ -46,8 +46,8 @@ server {
     proxy_set_header Host $host;
   }
 
-  ssl_certificate /etc/letsencrypt/live/lottis.vin-0001/fullchain.pem; # managed by Certbot
-  ssl_certificate_key /etc/letsencrypt/live/lottis.vin-0001/privkey.pem; # managed by Certbot
+  ssl_certificate /etc/letsencrypt/live/lottis.vin/fullchain.pem; # managed by Certbot
+  ssl_certificate_key /etc/letsencrypt/live/lottis.vin/privkey.pem; # managed by Certbot
 }
 
 server {
@@ -68,8 +68,8 @@ server {
     proxy_set_header Host $host;
   }
 
-  ssl_certificate /etc/letsencrypt/live/vinlottis.no-0003/fullchain.pem; # managed by Certbot
-  ssl_certificate_key /etc/letsencrypt/live/vinlottis.no-0003/privkey.pem; # managed by Certbot
+  ssl_certificate /etc/letsencrypt/live/vinlottis.no/fullchain.pem; # managed by Certbot
+  ssl_certificate_key /etc/letsencrypt/live/vinlottis.no/privkey.pem; # managed by Certbot
 }
 
 server {
@@ -112,8 +112,8 @@ server {
     proxy_set_header Host $host;
   }
 
-    ssl_certificate /etc/letsencrypt/live/kxo.lottis.vin/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/kxo.lottis.vin/privkey.pem; # managed by Certbot
+    ssl_certificate /etc/letsencrypt/live/knowit.vin/fullchain.pem; # managed by Certbot
+    ssl_certificate_key /etc/letsencrypt/live/knowit.vin/privkey.pem; # managed by Certbot
 }
 # KXO end
 # - - - - - - - -
diff --git a/sites-available/mc.conf b/sites-available/mc.conf
index d48c0ff..f951a21 100644
--- a/sites-available/mc.conf
+++ b/sites-available/mc.conf
@@ -10,8 +10,8 @@ server {
   listen 443 ssl http2;
   listen [::]:443 ssl http2;
   
-    ssl_certificate /etc/letsencrypt/live/mc.kevinmidboe.com-0001/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/mc.kevinmidboe.com-0001/privkey.pem; # managed by Certbot
+    ssl_certificate /etc/letsencrypt/live/mc.kevinmidboe.com/fullchain.pem; # managed by Certbot
+    ssl_certificate_key /etc/letsencrypt/live/mc.kevinmidboe.com/privkey.pem; # managed by Certbot
 #    include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
 #    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
diff --git a/sites-available/planetposen.conf b/sites-available/planetposen.conf
index fdb709a..e85583e 100644
--- a/sites-available/planetposen.conf
+++ b/sites-available/planetposen.conf
@@ -29,18 +29,18 @@ server {
 }
 
 server {
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
+   listen 443 ssl http2;
+   listen [::]:443 ssl http2;
 
-    server_name planetposen.no;
+   server_name planetposen.no;
 
-    location / {
-      root /opt/planetposen-original/;
-      autoindex off;
-    }
+   location / {
+     root /opt/planetposen-original/;
+     autoindex off;
+   }
 
-  ssl_certificate /etc/letsencrypt/live/planetposen.no-0001/fullchain.pem; # managed by Certbot
-  ssl_certificate_key /etc/letsencrypt/live/planetposen.no-0001/privkey.pem; # managed by Certbot
+   ssl_certificate /etc/letsencrypt/live/planetposen.no/fullchain.pem; # managed by Certbot
+   ssl_certificate_key /etc/letsencrypt/live/planetposen.no/privkey.pem; # managed by Certbot
 }
 
 server {
diff --git a/sites-available/request.conf b/sites-available/request.conf
index 98bf148..e0521c8 100644
--- a/sites-available/request.conf
+++ b/sites-available/request.conf
@@ -30,8 +30,8 @@ server {
     include snippets/proxy-params.conf;
   }
 
-  ssl_certificate /etc/letsencrypt/live/request.movie-0001/fullchain.pem; # managed by Certbot
-  ssl_certificate_key /etc/letsencrypt/live/request.movie-0001/privkey.pem; # managed by Certbot
+  ssl_certificate /etc/letsencrypt/live/request.movie/fullchain.pem; # managed by Certbot
+  ssl_certificate_key /etc/letsencrypt/live/request.movie/privkey.pem; # managed by Certbot
 }
 
 server {
diff --git a/sites-available/ruterna.conf b/sites-available/ruterna.conf
index cee3051..247e018 100644
--- a/sites-available/ruterna.conf
+++ b/sites-available/ruterna.conf
@@ -1,24 +1,24 @@
 
 server {
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
+  listen 443 ssl http2;
+  listen [::]:443 ssl http2;
 
-    server_name geobus.ruterna.no;
+  server_name geobus.ruterna.no;
 
-    location / {
-      proxy_http_version 1.1;
-      more_set_headers 'Access-Control-Allow-Origin: lottis.vin';
-      more_set_headers 'Access-Control-Allow-Methods: GET, POST, OPTIONS';
-      more_set_headers 'Access-Control-Allow-Headers: Content-Type';
+  location / {
+    proxy_http_version 1.1;
+    more_set_headers 'Access-Control-Allow-Origin: lottis.vin';
+    more_set_headers 'Access-Control-Allow-Methods: GET, POST, OPTIONS';
+    more_set_headers 'Access-Control-Allow-Headers: Content-Type';
 
-      proxy_set_header Upgrade $http_upgrade;
-      proxy_set_header Connection "Upgrade";
-      proxy_set_header Host $host;
-      proxy_pass http://localhost:31775;
-    }
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "Upgrade";
+    proxy_set_header Host $host;
+    proxy_pass http://localhost:31775;
+  }
 
-    ssl_certificate /etc/letsencrypt/live/vinlottis.no-0001/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/vinlottis.no-0001/privkey.pem; # managed by Certbot
+  ssl_certificate /etc/letsencrypt/live/ruterna.no/fullchain.pem; # managed by Certbot
+  ssl_certificate_key /etc/letsencrypt/live/vinlottis.no/privkey.pem; # managed by Certbot
 }
 
 
@@ -41,9 +41,7 @@ server {
 
     proxy_pass http://localhost:30011/; 
   }
-    ssl_certificate /etc/letsencrypt/live/ruterna.no-0001/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/ruterna.no-0001/privkey.pem; # managed by Certbot
-
-
 
+  ssl_certificate /etc/letsencrypt/live/ruterna.no/fullchain.pem; # managed by Certbot
+  ssl_certificate_key /etc/letsencrypt/live/ruterna.no/privkey.pem; # managed by Certbot
 }