diff --git a/docker-compose.yml b/docker-compose.yml
index d048559..103af52 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,7 +19,7 @@ services:
   # ---------------------------------------------------------------------------
 
   html:
-    container_name: docker_html
+    container_name: html
     image: nginx
     volumes:
       - ./html/html-wojciechkozlowski.eu/:/usr/share/nginx/html/
@@ -30,7 +30,7 @@ services:
   # ---------------------------------------------------------------------------
 
   wiki:
-    container_name: docker_wiki
+    container_name: wiki
     build: dokuwiki
     image: gitlab.wojciechkozlowski.eu:8443/wojtek/loki/wiki
     volumes:
@@ -42,7 +42,7 @@ services:
   # ---------------------------------------------------------------------------
 
   nextcloud-db:
-    container_name: nextcloud_db
+    container_name: nextcloud-db
     image: mariadb
     volumes:
       - vol_nextcloud_db:/var/lib/mysql
@@ -54,7 +54,7 @@ services:
     restart: always
 
   nextcloud-app:
-    container_name: nextcloud_app
+    container_name: nextcloud-app
     image: nextcloud:fpm
     links:
       - nextcloud-db
@@ -63,7 +63,7 @@ services:
     restart: always
 
   nextcloud-cron:
-    container_name: nextcloud_cron
+    container_name: nextcloud-cron
     build: nextcloud/cron
     image: gitlab.wojciechkozlowski.eu:8443/wojtek/loki/nextcloud-cron
     volumes_from:
@@ -71,7 +71,7 @@ services:
     restart: always
 
   nextcloud:
-    container_name: docker_cloud
+    container_name: nextcloud
     image: nginx
     links:
       - nextcloud-app
@@ -86,7 +86,7 @@ services:
   # ---------------------------------------------------------------------------
 
   gitlab:
-    container_name: docker_gitlab
+    container_name: gitlab
     image: gitlab/gitlab-ce
     environment:
       GITLAB_OMNIBUS_CONFIG: |
@@ -147,7 +147,7 @@ services:
   # ---------------------------------------------------------------------------
 
   runner:
-    container_name: gitlab_runner
+    container_name: runner-main
     build: runner
     image: gitlab.wojciechkozlowski.eu:8443/wojtek/loki/runner
     volumes:
diff --git a/loki-server.service b/loki-server.service
index d6b1c32..4e3d427 100644
--- a/loki-server.service
+++ b/loki-server.service
@@ -5,6 +5,7 @@ After=docker.service
 
 [Service]
 WorkingDirectory=/root/Dockerfiles
+Environment="COMPOSE_HTTP_TIMEOUT=300"
 ExecStart=/usr/bin/docker-compose up
 ExecStop=/usr/bin/docker-compose down
 Restart=always
diff --git a/nextcloud/nginx.conf b/nextcloud/nginx.conf
index d435d78..a89e18d 100644
--- a/nextcloud/nginx.conf
+++ b/nextcloud/nginx.conf
@@ -6,7 +6,7 @@ events {
 
 http {
   upstream backend {
-      server nextcloud_app:9000;
+      server nextcloud-app:9000;
   }
   include /etc/nginx/mime.types;
   default_type application/octet-stream;
diff --git a/proxy/nginx-conf.d/cloud.wojciechkozlowski.eu.conf b/proxy/nginx-conf.d/cloud.wojciechkozlowski.eu.conf
index e98682d..31d9903 100644
--- a/proxy/nginx-conf.d/cloud.wojciechkozlowski.eu.conf
+++ b/proxy/nginx-conf.d/cloud.wojciechkozlowski.eu.conf
@@ -22,7 +22,7 @@ server {
         proxy_set_header X-Real-IP  $remote_addr;
         proxy_set_header X-Forwarded-For $remote_addr;
         proxy_set_header Host $host;
-        proxy_pass http://docker_cloud;
+        proxy_pass http://nextcloud;
     }
 
     error_page   500 502 503 504  /50x.html;
diff --git a/proxy/nginx-conf.d/gitlab.wojciechkozlowski.eu.conf b/proxy/nginx-conf.d/gitlab.wojciechkozlowski.eu.conf
index 978fb1a..8e92485 100644
--- a/proxy/nginx-conf.d/gitlab.wojciechkozlowski.eu.conf
+++ b/proxy/nginx-conf.d/gitlab.wojciechkozlowski.eu.conf
@@ -20,7 +20,7 @@ server {
         proxy_set_header X-Real-IP  $remote_addr;
         proxy_set_header X-Forwarded-For $remote_addr;
         proxy_set_header Host $host;
-        proxy_pass http://docker_gitlab;
+        proxy_pass http://gitlab;
     }
 
     error_page   500 502 503 504  /50x.html;
diff --git a/proxy/nginx-conf.d/wiki.wojciechkozlowski.eu.conf b/proxy/nginx-conf.d/wiki.wojciechkozlowski.eu.conf
index af03da2..921d2cf 100644
--- a/proxy/nginx-conf.d/wiki.wojciechkozlowski.eu.conf
+++ b/proxy/nginx-conf.d/wiki.wojciechkozlowski.eu.conf
@@ -20,7 +20,7 @@ server {
         proxy_set_header X-Real-IP  $remote_addr;
         proxy_set_header X-Forwarded-For $remote_addr;
         proxy_set_header Host $host;
-        proxy_pass http://docker_wiki;
+        proxy_pass http://wiki;
     }
 
     error_page   500 502 503 504  /50x.html;
diff --git a/proxy/nginx-conf.d/wojciechkozlowski.eu.conf b/proxy/nginx-conf.d/wojciechkozlowski.eu.conf
index f524c90..49cc947 100644
--- a/proxy/nginx-conf.d/wojciechkozlowski.eu.conf
+++ b/proxy/nginx-conf.d/wojciechkozlowski.eu.conf
@@ -20,7 +20,7 @@ server {
         proxy_set_header X-Real-IP  $remote_addr;
         proxy_set_header X-Forwarded-For $remote_addr;
         proxy_set_header Host $host;
-        proxy_pass http://docker_html;
+        proxy_pass http://html;
     }
 
     error_page   500 502 503 504  /50x.html;
diff --git a/update.sh b/update.sh
index 5d9cdda..76cfaa8 100755
--- a/update.sh
+++ b/update.sh
@@ -25,7 +25,7 @@ make -C $DIRNAME pull-all
 
 echo -e "${CYAN}[${SCRIPT}] Restart the containers${NC}"
 
-COMPOSE_HTTP_TIMEOUT=300 service loki-server restart
+service loki-server restart
 
 # -----------------------------------------------------------------------------
 # Wait for containers to start.