diff --git a/.config/000-default.conf b/.config/000-default.conf
index 444bb399..02478a16 100644
--- a/.config/000-default.conf
+++ b/.config/000-default.conf
@@ -1,5 +1,6 @@
 <VirtualHost *:80>
-   Redirect / https://${SERVER_NAME}
+    RewriteEngine on
+    RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
 </VirtualHost>
 
 <VirtualHost *:443>
diff --git a/13.0/apache/config/000-default.conf b/13.0/apache/config/000-default.conf
index 444bb399..02478a16 100644
--- a/13.0/apache/config/000-default.conf
+++ b/13.0/apache/config/000-default.conf
@@ -1,5 +1,6 @@
 <VirtualHost *:80>
-   Redirect / https://${SERVER_NAME}
+    RewriteEngine on
+    RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
 </VirtualHost>
 
 <VirtualHost *:443>
diff --git a/13.0/fpm-alpine/config/000-default.conf b/13.0/fpm-alpine/config/000-default.conf
index 444bb399..02478a16 100644
--- a/13.0/fpm-alpine/config/000-default.conf
+++ b/13.0/fpm-alpine/config/000-default.conf
@@ -1,5 +1,6 @@
 <VirtualHost *:80>
-   Redirect / https://${SERVER_NAME}
+    RewriteEngine on
+    RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
 </VirtualHost>
 
 <VirtualHost *:443>
diff --git a/13.0/fpm/config/000-default.conf b/13.0/fpm/config/000-default.conf
index 444bb399..02478a16 100644
--- a/13.0/fpm/config/000-default.conf
+++ b/13.0/fpm/config/000-default.conf
@@ -1,5 +1,6 @@
 <VirtualHost *:80>
-   Redirect / https://${SERVER_NAME}
+    RewriteEngine on
+    RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
 </VirtualHost>
 
 <VirtualHost *:443>
diff --git a/14.0/apache/config/000-default.conf b/14.0/apache/config/000-default.conf
index 444bb399..02478a16 100644
--- a/14.0/apache/config/000-default.conf
+++ b/14.0/apache/config/000-default.conf
@@ -1,5 +1,6 @@
 <VirtualHost *:80>
-   Redirect / https://${SERVER_NAME}
+    RewriteEngine on
+    RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
 </VirtualHost>
 
 <VirtualHost *:443>
diff --git a/14.0/fpm-alpine/config/000-default.conf b/14.0/fpm-alpine/config/000-default.conf
index 444bb399..02478a16 100644
--- a/14.0/fpm-alpine/config/000-default.conf
+++ b/14.0/fpm-alpine/config/000-default.conf
@@ -1,5 +1,6 @@
 <VirtualHost *:80>
-   Redirect / https://${SERVER_NAME}
+    RewriteEngine on
+    RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
 </VirtualHost>
 
 <VirtualHost *:443>
diff --git a/14.0/fpm/config/000-default.conf b/14.0/fpm/config/000-default.conf
index 444bb399..02478a16 100644
--- a/14.0/fpm/config/000-default.conf
+++ b/14.0/fpm/config/000-default.conf
@@ -1,5 +1,6 @@
 <VirtualHost *:80>
-   Redirect / https://${SERVER_NAME}
+    RewriteEngine on
+    RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
 </VirtualHost>
 
 <VirtualHost *:443>
diff --git a/15.0/apache/config/000-default.conf b/15.0/apache/config/000-default.conf
index 444bb399..02478a16 100644
--- a/15.0/apache/config/000-default.conf
+++ b/15.0/apache/config/000-default.conf
@@ -1,5 +1,6 @@
 <VirtualHost *:80>
-   Redirect / https://${SERVER_NAME}
+    RewriteEngine on
+    RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
 </VirtualHost>
 
 <VirtualHost *:443>
diff --git a/15.0/fpm-alpine/config/000-default.conf b/15.0/fpm-alpine/config/000-default.conf
index 444bb399..02478a16 100644
--- a/15.0/fpm-alpine/config/000-default.conf
+++ b/15.0/fpm-alpine/config/000-default.conf
@@ -1,5 +1,6 @@
 <VirtualHost *:80>
-   Redirect / https://${SERVER_NAME}
+    RewriteEngine on
+    RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
 </VirtualHost>
 
 <VirtualHost *:443>
diff --git a/15.0/fpm/config/000-default.conf b/15.0/fpm/config/000-default.conf
index 444bb399..02478a16 100644
--- a/15.0/fpm/config/000-default.conf
+++ b/15.0/fpm/config/000-default.conf
@@ -1,5 +1,6 @@
 <VirtualHost *:80>
-   Redirect / https://${SERVER_NAME}
+    RewriteEngine on
+    RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
 </VirtualHost>
 
 <VirtualHost *:443>