diff --git a/dspace/config/log4j2-cli.xml b/dspace/config/log4j2-cli.xml
index 6cac529978fc..1ccfe744de94 100644
--- a/dspace/config/log4j2-cli.xml
+++ b/dspace/config/log4j2-cli.xml
@@ -23,7 +23,7 @@
     <Appenders>
         <!-- A1 is for most DSpace activity -->
         <Appender name='A1'
-                  filePattern="${log.dir}/dspace-cli.log-%d{yyyy-MM-dd}"
+                  filePattern="${log.dir}/dspace-cli.log-%d{yyyy-MM-dd}.gz"
                   type='RollingFile'
                   fileName='${log.dir}/dspace-cli.log'
         >
@@ -34,19 +34,11 @@
             <policies>
                 <policy type='TimeBasedTriggeringPolicy'>yyyy-MM-dd</policy>
             </policies>
-            <!-- Sample deletion policy:  keep last 30 archived files
-            <DefaultRolloverStrategy>
-                <Delete basePath='${log.dir}'>
-                    <IfFileName glob='dspace-cli.log-*'/>
-                    <IfAccumulatedFileCount exceeds='30'/>
-                </Delete>
-            </DefaultRolloverStrategy>
-            -->
         </Appender>
 
         <!-- A2 is for the checksum checker -->
         <Appender name='A2'
-                  filePattern="${log.dir}/checker.log-%d{yyyy-MM-dd}"
+                  filePattern="${log.dir}/checker.log-%d{yyyy-MM-dd}.gz"
                   type='RollingFile'
                   fileName='${log.dir}/checker.log'>
             <Layout type='PatternLayout'
@@ -54,14 +46,6 @@
             <policies>
                 <policy type='TimeBasedTriggeringPolicy'>yyyy-MM-dd</policy>
             </policies>
-            <!-- Sample deletion policy:  keep last 30 archived files
-            <DefaultRolloverStrategy>
-                <Delete basePath='${log.dir}'>
-                    <IfFileName glob='checker.log-*'/>
-                    <IfAccumulatedFileCount exceeds='30'/>
-                </Delete>
-            </DefaultRolloverStrategy>
-            -->
         </Appender>
     </Appenders>
 
diff --git a/dspace/config/log4j2-handle-plugin.xml b/dspace/config/log4j2-handle-plugin.xml
index 5f72e05c7303..1f8093c3ee0e 100644
--- a/dspace/config/log4j2-handle-plugin.xml
+++ b/dspace/config/log4j2-handle-plugin.xml
@@ -13,7 +13,7 @@
     <Appenders>
         <!-- A1 is for Handle Plugin activity -->
         <Appender name='A1'
-                  filePattern="${log.dir}/handle-plugin.log-%d{yyyy-MM-dd}"
+                  filePattern="${log.dir}/handle-plugin.log-%d{yyyy-MM-dd}.gz"
                   type='RollingFile'
                   fileName='${log.dir}/handle-plugin.log'
 
@@ -25,14 +25,6 @@
             <policies>
                 <policy type='TimeBasedTriggeringPolicy'>yyyy-MM-dd</policy>
             </policies>
-            <!-- Sample deletion policy:  keep last 30 archived files
-            <DefaultRolloverStrategy>
-                <Delete basePath='${log.dir}'>
-                    <IfFileName glob='dspace.log-*'/>
-                    <IfAccumulatedFileCount exceeds='30'/>
-                </Delete>
-            </DefaultRolloverStrategy>
-            -->
         </Appender>
 
     </Appenders>
diff --git a/dspace/config/log4j2.xml b/dspace/config/log4j2.xml
index 455ed7fe6d89..3273551bc0f6 100644
--- a/dspace/config/log4j2.xml
+++ b/dspace/config/log4j2.xml
@@ -23,7 +23,7 @@
     <Appenders>
         <!-- A1 is for most DSpace activity -->
         <Appender name='A1'
-                  filePattern="${log.dir}/dspace.log-%d{yyyy-MM-dd}"
+                  filePattern="${log.dir}/dspace.log-%d{yyyy-MM-dd}.gz"
                   type='RollingFile'
                   fileName='${log.dir}/dspace.log'
 
@@ -37,19 +37,11 @@
             <policies>
                 <policy type='TimeBasedTriggeringPolicy'>yyyy-MM-dd</policy>
             </policies>
-            <!-- Sample deletion policy:  keep last 30 archived files
-            <DefaultRolloverStrategy>
-                <Delete basePath='${log.dir}'>
-                    <IfFileName glob='dspace.log-*'/>
-                    <IfAccumulatedFileCount exceeds='30'/>
-                </Delete>
-            </DefaultRolloverStrategy>
-            -->
         </Appender>
 
         <!-- A2 is for the checksum checker -->
         <Appender name='A2'
-                  filePattern="${log.dir}/checker.log-%d{yyyy-MM-dd}"
+                  filePattern="${log.dir}/checker.log-%d{yyyy-MM-dd}.gz"
                   type='RollingFile'
                   fileName='${log.dir}/checker.log'>
             <Layout type='PatternLayout'
@@ -57,19 +49,11 @@
             <policies>
                 <policy type='TimeBasedTriggeringPolicy'>yyyy-MM-dd</policy>
             </policies>
-            <!-- Sample deletion policy:  keep last 30 archived files
-            <DefaultRolloverStrategy>
-                <Delete basePath='${log.dir}'>
-                    <IfFileName glob='checker.log-*'/>
-                    <IfAccumulatedFileCount exceeds='30'/>
-                </Delete>
-            </DefaultRolloverStrategy>
-            -->
         </Appender>
 
         <!-- A3 is for tracking file downloads  -->
         <Appender name='A3'
-                  filePattern="${log.dir}/file_downloads.log-%d{yyyy-MM-dd}"
+                  filePattern="${log.dir}/file_downloads.log-%d{yyyy-MM-dd}.gz"
                   type='RollingFile'
                   fileName='${log.dir}/file_downloads.log'>
             <Layout type='PatternLayout'
@@ -81,7 +65,7 @@
 
         <!-- A4 is for Warns and errors -->
         <Appender name='A4'
-                  filePattern="${log.dir}/warn.log-%d{yyyy-MM-dd}"
+                  filePattern="${log.dir}/warn.log-%d{yyyy-MM-dd}.gz"
                   type='RollingFile'
                   fileName='${log.dir}/warn.log'
         >
diff --git a/scripts/log4j2.solr.xml b/scripts/log4j2.solr.xml
index 6f0e30e5b5b4..79e8b3f94a23 100644
--- a/scripts/log4j2.solr.xml
+++ b/scripts/log4j2.solr.xml
@@ -31,7 +31,7 @@
         <RollingRandomAccessFile
                 name="MainLogFile"
                 fileName="${sys:solr.log.dir}/solr.log"
-                filePattern="${sys:solr.log.dir}/solr.log.%i" >
+                filePattern="${sys:solr.log.dir}/solr.log.%i.gz" >
             <PatternLayout>
                 <Pattern>
                     %maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m%notEmpty{ =>%ex{short}}}{10240}%n
@@ -47,7 +47,7 @@
         <RollingRandomAccessFile
                 name="SlowLogFile"
                 fileName="${sys:solr.log.dir}/solr_slow_requests.log"
-                filePattern="${sys:solr.log.dir}/solr_slow_requests.log.%i" >
+                filePattern="${sys:solr.log.dir}/solr_slow_requests.log.%i.gz" >
             <PatternLayout>
                 <Pattern>
                     %maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m%notEmpty{ =>%ex{short}}}{10240}%n