diff --git a/src/install.sh b/src/install.sh
index 550d8af..497e9b0 100755
--- a/src/install.sh
+++ b/src/install.sh
@@ -51,6 +51,12 @@ config_ssh "deploy"
 install_docker
 create_networks
 
+# Add users to docker group (after Docker installation creates the group)
+echo "[ INSTALL ]: Adding users to docker group"
+sudo usermod -aG docker $1
+sudo usermod -aG docker deploy
+echo "[ INSTALL ]: Users $1 and deploy added to docker group"
+
 # Web
 install_caddy $1 "$REPO_DIR" "$DEVELOPMENT_MODE"
 setup_ufw
diff --git a/src/user/create_deploy_user.sh b/src/user/create_deploy_user.sh
index a3d122b..46c4164 100644
--- a/src/user/create_deploy_user.sh
+++ b/src/user/create_deploy_user.sh
@@ -14,8 +14,7 @@ function create_deploy_user() {
 
   echo "[ USER ]: Adding user to groups"
   sudo usermod -aG www-data $username
-  sudo usermod -aG docker $username
-  echo "[ USER ]: User added to the following groupps (www-data, docker)"
+  echo "[ USER ]: User added to the following groups (www-data)"
 
   echo "[ USER ]: Creating deploy folders under /home/$username"
   sudo mkdir -p /home/$username/static
diff --git a/src/user/create_user.sh b/src/user/create_user.sh
index 42bb61d..a27f652 100644
--- a/src/user/create_user.sh
+++ b/src/user/create_user.sh
@@ -15,8 +15,7 @@ function create_user() {
   echo "[ USER ]: Adding user to groups"
   sudo usermod -aG sudo $username
   sudo usermod -aG www-data $username
-  sudo usermod -aG docker $username
-  echo "[ USER ]: User added to the following groupps (sudo, www-data, docker)"
+  echo "[ USER ]: User added to the following groups (sudo, www-data)"
 
   echo "[ USER ]: Setting ownership of /home/$username folder"
   sudo chown -R $username:$username /home/$username
diff --git a/src/web/install_caddy.sh b/src/web/install_caddy.sh
index df2e43e..d07f822 100644
--- a/src/web/install_caddy.sh
+++ b/src/web/install_caddy.sh
@@ -24,6 +24,7 @@ function install_caddy() {
   cp "$template_path/caddy/coraza/coraza.conf" "$caddy_dir/caddy/coraza/coraza.conf"
   cp "$template_path/crowdsec/acquis.yaml" "$caddy_dir/crowdsec/acquis.yaml"
   cp "$template_path/caddy/sites-enabled/prometheus.Caddyfile" "$caddy_dir/caddy/sites-enabled/prometheus.Caddyfile"
+  cp "$template_path/caddy/sites-enabled/loki.Caddyfile" "$caddy_dir/caddy/sites-enabled/loki.Caddyfile"
   cp "$template_path/caddy/sites-enabled/examples.Caddyfile" "$caddy_dir/caddy/sites-enabled/examples.Caddyfile"
 
   if [ "$development_mode" = "true" ]; then