diff --git a/docker/glpi/entrypoint.sh b/docker/glpi/entrypoint.sh
index 6460cc8612bb5d7795cece5e6428f2d10764ce4a..dcef563f8190e9a5be7a098f840a234fa6a99472 100755
--- a/docker/glpi/entrypoint.sh
+++ b/docker/glpi/entrypoint.sh
@@ -41,5 +41,13 @@ cronjob() {
         sleep 60
     done
 }
+if [ -z "$(grep RewriteBase /var/www/html/.htaccess)" ]; then
+cat << EOF >> /var/www/html/.htaccess
+RewriteBase /
+RewriteEngine On
+RewriteCond %{REQUEST_URI} !^/public
+RewriteRule ^(.*)$ public/index.php [QSA,L]
+EOF
+fi
 cronjob &
 exec apache2ctl -DFOREGROUND
diff --git a/glpi b/glpi
index 4d7f53e0eb27e873a5ee99fe264d10260b6b2b43..b7c6766580f170aa3a490b12f3eadfb0a02a9bbb 100755
--- a/glpi
+++ b/glpi
@@ -97,6 +97,16 @@ upgrade_glpi() {
     $0 console plugin:activate --all
     # Cleanup
     $cmd rm $prefix/install/install.php
+    # Ensure security
+    if [ -z "$(grep RewriteBase $prefix/.htaccess)" ]; then
+        cat << EOF >> $prefix/.htaccess
+RewriteBase /
+RewriteEngine On
+RewriteCond %{REQUEST_URI} !^/public
+RewriteRule ^(.*)$ public/index.php [QSA,L]
+EOF
+    fi
+
 }
 
 action=$1