diff --git a/.gitignore b/.gitignore
index 12341cc..3d590d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,6 @@ lib
 
 release.properties
 *.releaseBackup
+
+docker/geoserver/additional_libs/*
+docker/geoserver/geoserver_data/*
diff --git a/docker/geoserver/geoserver_data/global.xml b/docker/geoserver/geoserver_data/global.xml
deleted file mode 100644
index 468017f..0000000
--- a/docker/geoserver/geoserver_data/global.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<global>
-  <settings>
-    <contact>
-      <id>contact</id>
-    </contact>
-    <charset>UTF-8</charset>
-    <numDecimals>4</numDecimals>
-    <verbose>true</verbose>
-    <verboseExceptions>false</verboseExceptions>
-    <metadata>
-      <map>
-        <entry>
-          <string>quietOnNotFound</string>
-          <boolean>false</boolean>
-        </entry>
-      </map>
-    </metadata>
-    <localWorkspaceIncludesPrefix>false</localWorkspaceIncludesPrefix>
-    <showCreatedTimeColumnsInAdminList>false</showCreatedTimeColumnsInAdminList>
-    <showModifiedTimeColumnsInAdminList>false</showModifiedTimeColumnsInAdminList>
-  </settings>
-  <jai>
-    <allowInterpolation>false</allowInterpolation>
-    <recycling>false</recycling>
-    <tilePriority>5</tilePriority>
-    <tileThreads>7</tileThreads>
-    <memoryCapacity>0.5</memoryCapacity>
-    <memoryThreshold>0.75</memoryThreshold>
-    <imageIOCache>false</imageIOCache>
-    <pngAcceleration>false</pngAcceleration>
-    <jpegAcceleration>false</jpegAcceleration>
-    <allowNativeMosaic>false</allowNativeMosaic>
-    <allowNativeWarp>false</allowNativeWarp>
-    <pngEncoderType>PNGJ</pngEncoderType>
-    <jaiext>
-      <jaiExtOperations class="sorted-set">
-        <string>Affine</string>
-        <string>BandCombine</string>
-        <string>BandMerge</string>
-        <string>BandSelect</string>
-        <string>Binarize</string>
-        <string>Border</string>
-        <string>ColorConvert</string>
-        <string>Crop</string>
-        <string>ErrorDiffusion</string>
-        <string>Format</string>
-        <string>ImageFunction</string>
-        <string>Lookup</string>
-        <string>Mosaic</string>
-        <string>Null</string>
-        <string>OrderedDither</string>
-        <string>Rescale</string>
-        <string>Scale</string>
-        <string>Stats</string>
-        <string>Translate</string>
-        <string>Warp</string>
-        <string>algebric</string>
-        <string>operationConst</string>
-      </jaiExtOperations>
-    </jaiext>
-  </jai>
-  <coverageAccess>
-    <maxPoolSize>5</maxPoolSize>
-    <corePoolSize>5</corePoolSize>
-    <keepAliveTime>30000</keepAliveTime>
-    <queueType>UNBOUNDED</queueType>
-    <imageIOCacheThreshold>10240</imageIOCacheThreshold>
-  </coverageAccess>
-  <metadata>
-    <entry key="logRequestsEnabled">false</entry>
-  </metadata>
-  <updateSequence>1</updateSequence>
-  <featureTypeCacheSize>0</featureTypeCacheSize>
-  <globalServices>true</globalServices>
-  <useHeadersProxyURL>false</useHeadersProxyURL>
-  <xmlPostRequestLogBufferSize>1024</xmlPostRequestLogBufferSize>
-  <xmlExternalEntitiesEnabled>false</xmlExternalEntitiesEnabled>
-  <webUIMode>DEFAULT</webUIMode>
-  <allowStoredQueriesPerWorkspace>true</allowStoredQueriesPerWorkspace>
-</global>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/gwc-gs.xml b/docker/geoserver/geoserver_data/gwc-gs.xml
deleted file mode 100644
index eb74a3c..0000000
--- a/docker/geoserver/geoserver_data/gwc-gs.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<GeoServerGWCConfig>
-  <version>1.1.0</version>
-  <directWMSIntegrationEnabled>false</directWMSIntegrationEnabled>
-  <requireTiledParameter>true</requireTiledParameter>
-  <WMSCEnabled>true</WMSCEnabled>
-  <TMSEnabled>true</TMSEnabled>
-  <securityEnabled>false</securityEnabled>
-  <innerCachingEnabled>false</innerCachingEnabled>
-  <persistenceEnabled>true</persistenceEnabled>
-  <cacheProviderClass>class org.geowebcache.storage.blobstore.memory.guava.GuavaCacheProvider</cacheProviderClass>
-  <cacheConfigurations>
-    <entry>
-      <string>class org.geowebcache.storage.blobstore.memory.guava.GuavaCacheProvider</string>
-      <InnerCacheConfiguration>
-        <hardMemoryLimit>16</hardMemoryLimit>
-        <policy>NULL</policy>
-        <concurrencyLevel>4</concurrencyLevel>
-        <evictionTime>120</evictionTime>
-      </InnerCacheConfiguration>
-    </entry>
-  </cacheConfigurations>
-  <cacheLayersByDefault>true</cacheLayersByDefault>
-  <cacheNonDefaultStyles>true</cacheNonDefaultStyles>
-  <metaTilingX>4</metaTilingX>
-  <metaTilingY>4</metaTilingY>
-  <gutter>0</gutter>
-  <defaultCachingGridSetIds>
-    <string>EPSG:4326</string>
-    <string>EPSG:900913</string>
-  </defaultCachingGridSetIds>
-  <defaultCoverageCacheFormats>
-    <string>image/png</string>
-    <string>image/jpeg</string>
-  </defaultCoverageCacheFormats>
-  <defaultVectorCacheFormats>
-    <string>image/png</string>
-    <string>image/jpeg</string>
-  </defaultVectorCacheFormats>
-  <defaultOtherCacheFormats>
-    <string>image/png</string>
-    <string>image/jpeg</string>
-  </defaultOtherCacheFormats>
-</GeoServerGWCConfig>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/gwc/geowebcache.xml b/docker/geoserver/geoserver_data/gwc/geowebcache.xml
deleted file mode 100644
index 3abf1df..0000000
--- a/docker/geoserver/geoserver_data/gwc/geowebcache.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<gwcConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns="http://geowebcache.org/schema/1.8.0"
-  xsi:schemaLocation="http://geowebcache.org/schema/1.8.0 http://geowebcache.org/schema/1.8.0/geowebcache.xsd">
-  <version>1.8.0</version>
-  <backendTimeout>120</backendTimeout>
-  <!--
-  <serviceInformation>
-    <title>GeoWebCache</title>
-    <description>GeoWebCache is an advanced tile cache for WMS servers. It supports a large variety of protocols and
-      formats, including WMS-C, WMTS, KML, Google Maps and Virtual Earth.</description>
-    <keywords>
-      <string>WFS</string>
-      <string>WMS</string>
-      <string>WMTS</string>
-      <string>GEOWEBCACHE</string>
-    </keywords>
-    <serviceProvider>
-      <providerName>John Smith inc.</providerName>
-      <providerSite>http://www.example.com/</providerSite>
-      <serviceContact>
-        <individualName>John Smith</individualName>
-        <positionName>Geospatial Expert</positionName>
-        <addressType>Work</addressType>
-        <addressStreet>1 Bumpy St.</addressStreet>
-        <addressCity>Hobart</addressCity>
-        <addressAdministrativeArea>TAS</addressAdministrativeArea>
-        <addressPostalCode>7005</addressPostalCode>
-        <addressCountry>Australia</addressCountry>
-        <phoneNumber>+61 3 0000 0000</phoneNumber>
-        <faxNumber>+61 3 0000 0001</faxNumber>
-        <addressEmail>john.smith@example.com</addressEmail>
-      </serviceContact>
-    </serviceProvider>
-    <fees>NONE</fees>
-    <accessConstraints>NONE</accessConstraints>
-  </serviceInformation>
-  -->
-  <gridSets>
-    <!-- Grid Set Example, by default EPSG:900913 and EPSG:4326 are defined -->
-    <!--
-    <gridSet>
-      <name>EPSG:2163</name>
-      <srs>
-        <number>2163</number>
-      </srs>
-      <extent>
-        <coords>
-          <double>-2495667.977678598</double>
-          <double>-2223677.196231552</double>
-          <double>3291070.6104286816</double>
-          <double>959189.3312465074</double>
-        </coords>
-      </extent>
-      <scaleDenominators>
-        <double>25000000</double>
-        <double>1000000</double>
-        <double>100000</double>
-        <double>25000</double>
-      </scaleDenominators>
-      <tileHeight>200</tileHeight>
-      <tileWidth>200</tileWidth>
-    </gridSet>
-    -->
-  </gridSets>
-
-  <layers>
-    <!--
-    <wmsLayer>
-      <name>topp:states</name>
-      <mimeFormats>
-        <string>image/gif</string>
-        <string>image/jpeg</string>
-        <string>image/png</string>
-        <string>image/png8</string>
-      </mimeFormats>
-      <gridSubsets>
-        <gridSubset>
-          <gridSetName>EPSG:2163</gridSetName>
-        </gridSubset>
-      </gridSubsets>
-      <parameterFilters>
-        <stringParameterFilter>
-          <key>STYLES</key>
-          <defaultValue>population</defaultValue>
-          <values>
-            <string>population</string>
-            <string>polygon</string>
-            <string>pophatch</string>
-          </values>
-        </stringParameterFilter>
-      </parameterFilters>
-      <wmsUrl>
-        <string>http://demo.opengeo.org/geoserver/topp/wms</string>
-      </wmsUrl>
-    </wmsLayer>
-
-    <wmsLayer>
-      <name>raster test layer</name>
-      <mimeFormats>
-        <string>image/gif</string>
-        <string>image/jpeg</string>
-        <string>image/png</string>
-        <string>image/png8</string>
-      </mimeFormats>
-      <wmsUrl>
-        <string>http://demo.opengeo.org/geoserver/wms</string>
-      </wmsUrl>
-      <wmsLayers>nurc:Img_Sample</wmsLayers>
-    </wmsLayer>
-
-    <wmsLayer>
-      <name>img states</name>
-      <metaInformation>
-        <title>Nicer title for Image States</title>
-        <description>This is a description. Fascinating.</description>
-      </metaInformation>
-      <mimeFormats>
-        <string>image/gif</string>
-        <string>image/jpeg</string>
-        <string>image/png</string>
-        <string>image/png8</string>
-      </mimeFormats>
-      <gridSubsets>
-        <gridSubset>
-          <gridSetName>EPSG:4326</gridSetName>
-          <extent>
-            <coords>
-              <double>-129.6</double>
-              <double>3.45</double>
-              <double>-62.1</double>
-              <double>70.9</double>
-            </coords>
-          </extent>
-        </gridSubset>
-      </gridSubsets>
-      <expireCacheList>
-        <expirationRule minZoom="0" expiration="60" />
-      </expireCacheList>
-      <expireClientsList>
-        <expirationRule minZoom="0" expiration="500" />
-      </expireClientsList>
-      <wmsUrl>
-        <string>http://demo.opengeo.org/geoserver/wms</string>
-      </wmsUrl>
-      <wmsLayers>nurc:Img_Sample,topp:states</wmsLayers>
-      <transparent>false</transparent>
-      <bgColor>0x0066FF</bgColor>
-    </wmsLayer>
-    -->
-  </layers>
-  
-</gwcConfiguration>
diff --git a/docker/geoserver/geoserver_data/gwc/metadata.properties b/docker/geoserver/geoserver_data/gwc/metadata.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/docker/geoserver/geoserver_data/logging.xml b/docker/geoserver/geoserver_data/logging.xml
deleted file mode 100644
index 10fbf88..0000000
--- a/docker/geoserver/geoserver_data/logging.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<logging>
-  <level>PRODUCTION_LOGGING</level>
-  <stdOutLogging>true</stdOutLogging>
-</logging>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/logs/DEFAULT_LOGGING.xml b/docker/geoserver/geoserver_data/logs/DEFAULT_LOGGING.xml
deleted file mode 100644
index 95a7aff..0000000
--- a/docker/geoserver/geoserver_data/logs/DEFAULT_LOGGING.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This log4j configuration file needs to stay here, and is used as the default logging setup -->
-<!-- during data_dir upgrades and in case the chosen logging config isn't available.            -->
-<Configuration name="DEFAULT_LOGGING" status="fatal" dest="out">
-    <Appenders>
-        <Console name="stdout" target="SYSTEM_OUT">
-            <PatternLayout pattern="%date{dd mmm HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
-        </Console>
-        <RollingFile name="geoserverlogfile">
-            <filename>logs/geoserver.log</filename>
-            <filePattern>logs/geoserver-%i.log</filePattern>
-            <PatternLayout pattern="%date{dd mmm HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="20 MB" />
-            </Policies>
-            <DefaultRolloverStrategy max="3" fileIndex="min"/>
-        </RollingFile>
-    </Appenders>
-    <Loggers>
-        <Logger name="org.geotools" level="warn" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-        <Logger name="org.geotools.factory" level="warn" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-        <Logger name="org.geoserver" level="CONFIG" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-        <Logger name="org.vfny.geoserver" level="CONFIG" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-
-        <Logger name="org.springframework" level="warn" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-
-        <Logger name="org.geowebcache" level="CONFIG" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-        <Logger name="org.geowebcache.seed" level="warn" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-        <Root level="warn">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Root>
-    </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/logs/GEOSERVER_DEVELOPER_LOGGING.xml b/docker/geoserver/geoserver_data/logs/GEOSERVER_DEVELOPER_LOGGING.xml
deleted file mode 100644
index f94ad23..0000000
--- a/docker/geoserver/geoserver_data/logs/GEOSERVER_DEVELOPER_LOGGING.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This log4j configuration file needs to stay here, and is used as a default logging setup   -->
-<!-- during data_dir upgrades and in case the chosen logging config isn't available.            -->
-<Configuration name="GEOSERVER_DEVELOPER_LOGGING" status="fatal" dest="out">
-    <!-- As GeoTools uses java.util.logging levels instead of log4j, GeoServer makes the        -->
-    <!-- following mappings to adjust the log4j levels specified in this file.                  -->
-    <!--                                                                                        -->
-    <!-- Log4J Level          java.util.logging Level                                           -->
-    <!-- ==================== =======================                                           -->
-    <!-- ALL                   ALL                                                              -->
-    <!-- FINEST                FINEST                                                           -->
-    <!-- TRACE                 FINER                                                            -->
-    <!-- DEBUG                 FINE                                                             -->
-    <!-- CONFIG                CONFIG                                                           -->
-    <!-- INFO                  INFO                                                             -->
-    <!-- WARN                  WARNING                                                          -->
-    <!-- ERROR                 SEVERE                                                           -->
-    <!-- FATAL                 FATAL                                                            -->
-    <!-- OFF                   OFF                                                              -->
-    <Appenders>
-        <Console name="stdout" target="SYSTEM_OUT">
-            <PatternLayout pattern="%date{dd mmm HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
-        </Console>
-        <RollingFile name="geoserverlogfile">
-            <filename>logs/geoserver.log</filename>
-            <filePattern>logs/geoserver-%i.log</filePattern>
-            <PatternLayout pattern="%date{dd mmm HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="20 MB" />
-            </Policies>
-            <DefaultRolloverStrategy max="3" fileIndex="min"/>
-        </RollingFile>
-    </Appenders>
-    <Loggers>
-
-        <Logger name="org.geotools" level="warn" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-        <Logger name="org.geotools.factory" level="warn" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-
-        <Logger name="org.geoserver" level="trace" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-        <Logger name="org.vfny.geoserver" level="trace" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-
-        <Logger name="org.springframework" level="warn" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-
-        <Root level="warn">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Root>
-    </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/logs/GEOTOOLS_DEVELOPER_LOGGING.xml b/docker/geoserver/geoserver_data/logs/GEOTOOLS_DEVELOPER_LOGGING.xml
deleted file mode 100644
index 9772195..0000000
--- a/docker/geoserver/geoserver_data/logs/GEOTOOLS_DEVELOPER_LOGGING.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This log4j configuration file needs to stay here, and is used as a default logging setup   -->
-<!-- during data_dir upgrades and in case the chosen logging config isn't available.            -->
-<Configuration name="GEOTOOLS_DEVELOPER_LOGGING" status="fatal" dest="out">
-    <!-- As GeoTools uses java.util.logging levels instead of log4j, GeoServer makes the        -->
-    <!-- following mappings to adjust the log4j levels specified in this file.                  -->
-    <!--                                                                                        -->
-    <!-- Log4J Level          java.util.logging Level                                           -->
-    <!-- ==================== =======================                                           -->
-    <!-- ALL                   ALL                                                              -->
-    <!-- FINEST                FINEST                                                           -->
-    <!-- TRACE                 FINER                                                            -->
-    <!-- DEBUG                 FINE                                                             -->
-    <!-- CONFIG                CONFIG                                                           -->
-    <!-- INFO                  INFO                                                             -->
-    <!-- WARN                  WARNING                                                          -->
-    <!-- ERROR                 SEVERE                                                           -->
-    <!-- FATAL                 FATAL                                                            -->
-    <!-- OFF                   OFF                                                              -->
-    <Appenders>
-        <Console name="stdout" target="SYSTEM_OUT">
-            <PatternLayout pattern="%date{dd mmm HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
-        </Console>
-        <RollingFile name="geoserverlogfile">
-            <filename>logs/geoserver.log</filename>
-            <filePattern>logs/geoserver-%i.log</filePattern>
-            <PatternLayout pattern="%date{dd mmm HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="20 MB" />
-            </Policies>
-            <DefaultRolloverStrategy max="3" fileIndex="min"/>
-        </RollingFile>
-    </Appenders>
-    <Loggers>
-
-        <Logger name="org.geotools" level="trace" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-        <Logger name="org.geotools.factory" level="trace" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-        <Logger name="org.geotools.renderer" level="trace" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-        <Logger name="org.geotools.data" level="trace" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-        <Logger name="org.geotools.feature" level="trace" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-        <Logger name="org.geotools.filter" level="trace" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-        <Logger name="org.geotools.filter" level="trace" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-
-        <Logger name="org.geoserver" level="CONFIG" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-        <Logger name="org.vfny.geoserver" level="CONFIG" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-
-        <Logger name="org.springframework" level="warn" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-
-        <Root level="warn">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Root>
-    </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/logs/PRODUCTION_LOGGING.xml b/docker/geoserver/geoserver_data/logs/PRODUCTION_LOGGING.xml
deleted file mode 100644
index d23a411..0000000
--- a/docker/geoserver/geoserver_data/logs/PRODUCTION_LOGGING.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This log4j configuration file needs to stay here, and is used as the default logging setup -->
-<!-- during data_dir upgrades and in case the chosen logging config isn't available.            -->
-<Configuration name="PRODUCTION_LOGGING" status="fatal" dest="out">
-    <Appenders>
-        <Console name="stdout" target="SYSTEM_OUT">
-            <PatternLayout pattern="%date{dd mmm HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
-        </Console>
-        <RollingFile name="geoserverlogfile">
-            <filename>logs/geoserver.log</filename>
-            <filePattern>logs/geoserver-%i.log</filePattern>
-            <PatternLayout pattern="%date{dd mmm HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="20 MB" />
-            </Policies>
-            <DefaultRolloverStrategy max="3" fileIndex="min"/>
-        </RollingFile>
-    </Appenders>
-    <Loggers>
-
-        <Logger name="org.geotools" level="warn" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-        <Logger name="org.geotools.factory" level="warn" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-
-        <Logger name="org.geoserver" level="warn" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-        <Logger name="org.vfny.geoserver" level="warn" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-
-        <Logger name="org.springframework" level="warn" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-
-        <Logger name="org.geowebcache" level="error" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-
-        <Root level="warn">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Root>
-    </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/logs/QUIET_LOGGING.xml b/docker/geoserver/geoserver_data/logs/QUIET_LOGGING.xml
deleted file mode 100644
index 1d61aae..0000000
--- a/docker/geoserver/geoserver_data/logs/QUIET_LOGGING.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This log4j configuration file needs to stay here, and is used as the default logging setup -->
-<!-- during data_dir upgrades and in case the chosen logging config isn't available.            -->
-<Configuration name="QUIET_LOGGING" status="off" dest="out">
-    <Appenders>
-        <Console name="stdout" target="SYSTEM_OUT">
-            <PatternLayout pattern="%date{dd mmm HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
-        </Console>
-    </Appenders>
-    <Loggers>
-        <Root level="off">
-            <AppenderRef ref="stdout"/>
-        </Root>
-    </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/logs/TEST_LOGGING.xml b/docker/geoserver/geoserver_data/logs/TEST_LOGGING.xml
deleted file mode 100644
index 786ebe6..0000000
--- a/docker/geoserver/geoserver_data/logs/TEST_LOGGING.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This log4j configuration file needs to stay here, and is used as the default logging setup -->
-<!-- during data_dir upgrades and in case the chosen logging config isn't available.            -->
-<Configuration name="TEST_LOGGING" status="fatal" dest="out">
-    <Appenders>
-        <Console name="stdout" target="SYSTEM_OUT">
-            <PatternLayout pattern="%date{dd mmm HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
-        </Console>
-    </Appenders>
-    <Loggers>
-        <Logger name="org.geotools" level="error" additivity="false">
-            <AppenderRef ref="stdout"/>
-        </Logger>
-        <Logger name="org.geotools.factory" level="error" additivity="false">
-            <AppenderRef ref="stdout"/>
-        </Logger>
-
-        <Logger name="org.geoserver" level="error" additivity="false">
-            <AppenderRef ref="stdout"/>
-        </Logger>
-        <Logger name="org.vfny.geoserver" level="error" additivity="false">
-            <AppenderRef ref="stdout"/>
-        </Logger>
-
-        <Logger name="org.springframework" level="error" additivity="false">
-            <AppenderRef ref="stdout"/>
-        </Logger>
-
-        <Logger name="org.apache.wicket.util.tester" level="info" additivity="false">
-            <AppenderRef ref="stdout"/>
-        </Logger>
-
-        <Root level="off">
-            <AppenderRef ref="stdout"/>
-        </Root>
-    </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/logs/VERBOSE_LOGGING.xml b/docker/geoserver/geoserver_data/logs/VERBOSE_LOGGING.xml
deleted file mode 100644
index 236507e..0000000
--- a/docker/geoserver/geoserver_data/logs/VERBOSE_LOGGING.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This log4j configuration file needs to stay here, and is used as a default logging setup   -->
-<!-- during data_dir upgrades and in case the chosen logging config isn't available.            -->
-<Configuration name="VERBOSE_LOGGING" status="fatal" dest="out">
-    <!-- As GeoTools uses java.util.logging levels instead of log4j, GeoServer makes the        -->
-    <!-- following mappings to adjust the log4j levels specified in this file.                  -->
-    <!--                                                                                        -->
-    <!-- Log4J Level          java.util.logging Level                                           -->
-    <!-- ==================== =======================                                           -->
-    <!-- ALL                   ALL                                                              -->
-    <!-- FINEST                FINEST                                                           -->
-    <!-- TRACE                 FINER                                                            -->
-    <!-- DEBUG                 FINE                                                             -->
-    <!-- CONFIG                CONFIG                                                           -->
-    <!-- INFO                  INFO                                                             -->
-    <!-- WARN                  WARNING                                                          -->
-    <!-- ERROR                 SEVERE                                                           -->
-    <!-- FATAL                 FATAL                                                            -->
-    <!-- OFF                   OFF                                                              -->
-    <Appenders>
-        <Console name="stdout" target="SYSTEM_OUT">
-            <PatternLayout pattern="%date{dd mmm HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
-        </Console>
-        <RollingFile name="geoserverlogfile">
-            <filename>logs/geoserver.log</filename>
-            <filePattern>logs/geoserver-%i.log</filePattern>
-            <PatternLayout pattern="%date{dd mmm HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="20 MB" />
-            </Policies>
-            <DefaultRolloverStrategy max="3" fileIndex="min"/>
-        </RollingFile>
-    </Appenders>
-    <Loggers>
-
-        <Logger name="org.geotools" level="trace" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-        <Logger name="org.geotools.factory" level="trace" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-
-        <Logger name="org.geoserver" level="trace" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-        <Logger name="org.vfny.geoserver" level="trace" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-
-        <Logger name="org.springframework" level="warn" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-
-        <Logger name="org.apache.wicket.util.tester" level="info" additivity="false">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Logger>
-
-        <Root level="warn">
-            <AppenderRef ref="stdout"/>
-            <AppenderRef ref="geoserverlogfile"/>
-        </Root>
-    </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/auth/default/config.xml b/docker/geoserver/geoserver_data/security/auth/default/config.xml
deleted file mode 100644
index bc3c9b2..0000000
--- a/docker/geoserver/geoserver_data/security/auth/default/config.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<usernamePassword>
-  <id>58d57299:1813eece7c0:-7fe7</id>
-  <name>default</name>
-  <className>org.geoserver.security.auth.UsernamePasswordAuthenticationProvider</className>
-  <userGroupServiceName>default</userGroupServiceName>
-</usernamePassword>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/config.xml b/docker/geoserver/geoserver_data/security/config.xml
deleted file mode 100644
index 579744b..0000000
--- a/docker/geoserver/geoserver_data/security/config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<security>
-  <roleServiceName>default</roleServiceName>
-  <authProviderNames>
-    <string>default</string>
-  </authProviderNames>
-  <configPasswordEncrypterName>pbePasswordEncoder</configPasswordEncrypterName>
-  <encryptingUrlParams>false</encryptingUrlParams>
-  <filterChain>
-    <filters name="web" class="org.geoserver.security.HtmlLoginFilterChain" interceptorName="interceptor" exceptionTranslationName="exception" path="/web/**,/gwc/rest/web/**,/" disabled="false" allowSessionCreation="true" ssl="false" matchHTTPMethod="false">
-      <filter>rememberme</filter>
-      <filter>form</filter>
-      <filter>anonymous</filter>
-    </filters>
-    <filters name="webLogin" class="org.geoserver.security.ConstantFilterChain" path="/j_spring_security_check,/j_spring_security_check/,/login" disabled="false" allowSessionCreation="true" ssl="false" matchHTTPMethod="false">
-      <filter>form</filter>
-    </filters>
-    <filters name="webLogout" class="org.geoserver.security.LogoutFilterChain" path="/j_spring_security_logout,/j_spring_security_logout/,/logout" disabled="false" allowSessionCreation="false" ssl="false" matchHTTPMethod="false">
-      <filter>formLogout</filter>
-    </filters>
-    <filters name="rest" class="org.geoserver.security.ServiceLoginFilterChain" interceptorName="restInterceptor" exceptionTranslationName="exception" path="/rest/**" disabled="false" allowSessionCreation="false" ssl="false" matchHTTPMethod="false">
-      <filter>basic</filter>
-      <filter>anonymous</filter>
-    </filters>
-    <filters name="gwc" class="org.geoserver.security.ServiceLoginFilterChain" interceptorName="restInterceptor" exceptionTranslationName="exception" path="/gwc/rest/**" disabled="false" allowSessionCreation="false" ssl="false" matchHTTPMethod="false">
-      <filter>basic</filter>
-    </filters>
-    <filters name="default" class="org.geoserver.security.ServiceLoginFilterChain" interceptorName="interceptor" exceptionTranslationName="exception" path="/**" disabled="false" allowSessionCreation="false" ssl="false" matchHTTPMethod="false">
-      <filter>basic</filter>
-      <filter>anonymous</filter>
-    </filters>
-  </filterChain>
-  <rememberMeService>
-    <className>org.geoserver.security.rememberme.GeoServerTokenBasedRememberMeServices</className>
-    <key>geoserver</key>
-  </rememberMeService>
-  <bruteForcePrevention>
-    <enabled>true</enabled>
-    <minDelaySeconds>1</minDelaySeconds>
-    <maxDelaySeconds>5</maxDelaySeconds>
-    <maxBlockedThreads>100</maxBlockedThreads>
-    <whitelistedMasks>
-      <string>127.0.0.1</string>
-    </whitelistedMasks>
-  </bruteForcePrevention>
-</security>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/filter/anonymous/config.xml b/docker/geoserver/geoserver_data/security/filter/anonymous/config.xml
deleted file mode 100644
index 4ce5f3d..0000000
--- a/docker/geoserver/geoserver_data/security/filter/anonymous/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<anonymousAuthentication>
-  <id>58d57299:1813eece7c0:-7fee</id>
-  <name>anonymous</name>
-  <className>org.geoserver.security.filter.GeoServerAnonymousAuthenticationFilter</className>
-</anonymousAuthentication>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/filter/basic/config.xml b/docker/geoserver/geoserver_data/security/filter/basic/config.xml
deleted file mode 100644
index 7ba9a92..0000000
--- a/docker/geoserver/geoserver_data/security/filter/basic/config.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<basicAuthentication>
-  <id>58d57299:1813eece7c0:-7ff2</id>
-  <name>basic</name>
-  <className>org.geoserver.security.filter.GeoServerBasicAuthenticationFilter</className>
-  <useRememberMe>true</useRememberMe>
-</basicAuthentication>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/filter/contextAsc/config.xml b/docker/geoserver/geoserver_data/security/filter/contextAsc/config.xml
deleted file mode 100644
index 28640ad..0000000
--- a/docker/geoserver/geoserver_data/security/filter/contextAsc/config.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<contextPersistence>
-  <id>58d57299:1813eece7c0:-7ff0</id>
-  <name>contextAsc</name>
-  <className>org.geoserver.security.filter.GeoServerSecurityContextPersistenceFilter</className>
-  <allowSessionCreation>true</allowSessionCreation>
-</contextPersistence>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/filter/contextNoAsc/config.xml b/docker/geoserver/geoserver_data/security/filter/contextNoAsc/config.xml
deleted file mode 100644
index 2e00157..0000000
--- a/docker/geoserver/geoserver_data/security/filter/contextNoAsc/config.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<contextPersistence>
-  <id>58d57299:1813eece7c0:-7fef</id>
-  <name>contextNoAsc</name>
-  <className>org.geoserver.security.filter.GeoServerSecurityContextPersistenceFilter</className>
-  <allowSessionCreation>false</allowSessionCreation>
-</contextPersistence>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/filter/exception/config.xml b/docker/geoserver/geoserver_data/security/filter/exception/config.xml
deleted file mode 100644
index 387591b..0000000
--- a/docker/geoserver/geoserver_data/security/filter/exception/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<exceptionTranslation>
-  <id>58d57299:1813eece7c0:-7fe9</id>
-  <name>exception</name>
-  <className>org.geoserver.security.filter.GeoServerExceptionTranslationFilter</className>
-</exceptionTranslation>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/filter/form/config.xml b/docker/geoserver/geoserver_data/security/filter/form/config.xml
deleted file mode 100644
index 4f169ff..0000000
--- a/docker/geoserver/geoserver_data/security/filter/form/config.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<usernamePasswordFilter>
-  <id>58d57299:1813eece7c0:-7ff1</id>
-  <name>form</name>
-  <className>org.geoserver.security.filter.GeoServerUserNamePasswordAuthenticationFilter</className>
-  <passwordParameterName>password</passwordParameterName>
-  <usernameParameterName>username</usernameParameterName>
-</usernamePasswordFilter>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/filter/formLogout/config.xml b/docker/geoserver/geoserver_data/security/filter/formLogout/config.xml
deleted file mode 100644
index e6d482e..0000000
--- a/docker/geoserver/geoserver_data/security/filter/formLogout/config.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<logoutFilter>
-  <id>58d57299:1813eece7c0:-7fea</id>
-  <name>formLogout</name>
-  <className>org.geoserver.security.filter.GeoServerLogoutFilter</className>
-  <redirectURL>/web/</redirectURL>
-  <formLogoutChain>/j_spring_security_logout,/j_spring_security_logout/,/logout</formLogoutChain>
-</logoutFilter>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/filter/interceptor/config.xml b/docker/geoserver/geoserver_data/security/filter/interceptor/config.xml
deleted file mode 100644
index 00ffacc..0000000
--- a/docker/geoserver/geoserver_data/security/filter/interceptor/config.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<securityInterceptor>
-  <id>58d57299:1813eece7c0:-7fec</id>
-  <name>interceptor</name>
-  <className>org.geoserver.security.filter.GeoServerSecurityInterceptorFilter</className>
-  <allowIfAllAbstainDecisions>false</allowIfAllAbstainDecisions>
-  <securityMetadataSource>geoserverMetadataSource</securityMetadataSource>
-</securityInterceptor>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/filter/rememberme/config.xml b/docker/geoserver/geoserver_data/security/filter/rememberme/config.xml
deleted file mode 100644
index 414f4c3..0000000
--- a/docker/geoserver/geoserver_data/security/filter/rememberme/config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<rememberMeAuthentication>
-  <id>58d57299:1813eece7c0:-7fed</id>
-  <name>rememberme</name>
-  <className>org.geoserver.security.filter.GeoServerRememberMeAuthenticationFilter</className>
-</rememberMeAuthentication>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/filter/restInterceptor/config.xml b/docker/geoserver/geoserver_data/security/filter/restInterceptor/config.xml
deleted file mode 100644
index 1e0b840..0000000
--- a/docker/geoserver/geoserver_data/security/filter/restInterceptor/config.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<securityInterceptor>
-  <id>58d57299:1813eece7c0:-7feb</id>
-  <name>restInterceptor</name>
-  <className>org.geoserver.security.filter.GeoServerSecurityInterceptorFilter</className>
-  <allowIfAllAbstainDecisions>false</allowIfAllAbstainDecisions>
-  <securityMetadataSource>restFilterDefinitionMap</securityMetadataSource>
-</securityInterceptor>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/filter/roleFilter/config.xml b/docker/geoserver/geoserver_data/security/filter/roleFilter/config.xml
deleted file mode 100644
index e206ee8..0000000
--- a/docker/geoserver/geoserver_data/security/filter/roleFilter/config.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<roleFilter>
-  <id>58d57299:1813eece7c0:-7fe6</id>
-  <name>roleFilter</name>
-  <className>org.geoserver.security.filter.GeoServerRoleFilter</className>
-  <httpResponseHeaderAttrForIncludedRoles>roles</httpResponseHeaderAttrForIncludedRoles>
-  <roleConverterName>roleConverter</roleConverterName>
-</roleFilter>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/filter/sslFilter/config.xml b/docker/geoserver/geoserver_data/security/filter/sslFilter/config.xml
deleted file mode 100644
index 4a75f62..0000000
--- a/docker/geoserver/geoserver_data/security/filter/sslFilter/config.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<sslFilter>
-  <id>58d57299:1813eece7c0:-7fe5</id>
-  <name>sslFilter</name>
-  <className>org.geoserver.security.filter.GeoServerSSLFilter</className>
-  <sslPort>443</sslPort>
-</sslFilter>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/geoserver.jceks b/docker/geoserver/geoserver_data/security/geoserver.jceks
deleted file mode 100644
index b21bf50..0000000
Binary files a/docker/geoserver/geoserver_data/security/geoserver.jceks and /dev/null differ
diff --git a/docker/geoserver/geoserver_data/security/layers.properties b/docker/geoserver/geoserver_data/security/layers.properties
deleted file mode 100644
index 0697b93..0000000
--- a/docker/geoserver/geoserver_data/security/layers.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-# rule structure is namespace.layer.operation=role1,role2,...
-# namespace: a namespace or * to catch them all (in that case, layer should be *)
-# layer: a layer/featureType/coverage name or * to catch them all
-# operation: r or w (read or write)
-# role list: * to imply all roles, or a list of explicit roles
-# The operation will be allowed if the current user has at least one of the
-# roles in the rule
-*.*.r=*
-*.*.w=ADMIN,GROUP_ADMIN
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/masterpw.digest b/docker/geoserver/geoserver_data/security/masterpw.digest
deleted file mode 100644
index 689cd44..0000000
--- a/docker/geoserver/geoserver_data/security/masterpw.digest
+++ /dev/null
@@ -1 +0,0 @@
-digest1:RRDAJtxdqKUsFr1J4t9qnUTwY7yKDlfAcLUTvD7ZT28uCZHvOfzo4HCt9xGrcVDR
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/masterpw.info b/docker/geoserver/geoserver_data/security/masterpw.info
deleted file mode 100644
index b740216..0000000
--- a/docker/geoserver/geoserver_data/security/masterpw.info
+++ /dev/null
@@ -1,7 +0,0 @@
-This file was created at 2022/06/07 16:08:47
-
-The generated master password is: n{OVX#J2
-
-Test the master password by logging in as user "root"
-
-This file should be removed after reading !!!.
diff --git a/docker/geoserver/geoserver_data/security/masterpw.xml b/docker/geoserver/geoserver_data/security/masterpw.xml
deleted file mode 100644
index 3091bc3..0000000
--- a/docker/geoserver/geoserver_data/security/masterpw.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<masterPassword>
-  <providerName>default</providerName>
-</masterPassword>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/masterpw/default/config.xml b/docker/geoserver/geoserver_data/security/masterpw/default/config.xml
deleted file mode 100644
index 05ea0cf..0000000
--- a/docker/geoserver/geoserver_data/security/masterpw/default/config.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<urlProvider>
-  <id>58d57299:1813eece7c0:-7ff7</id>
-  <name>default</name>
-  <className>org.geoserver.security.password.URLMasterPasswordProvider</className>
-  <readOnly>false</readOnly>
-  <loginEnabled>false</loginEnabled>
-  <url>file:passwd</url>
-  <encrypting>true</encrypting>
-</urlProvider>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/masterpw/default/passwd b/docker/geoserver/geoserver_data/security/masterpw/default/passwd
deleted file mode 100644
index a4b086f..0000000
--- a/docker/geoserver/geoserver_data/security/masterpw/default/passwd
+++ /dev/null
@@ -1 +0,0 @@
-1Aav3YIWCeR7isuM/4U6EjDa329DqKo2
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/pwpolicy/default/config.xml b/docker/geoserver/geoserver_data/security/pwpolicy/default/config.xml
deleted file mode 100644
index 8fdb15b..0000000
--- a/docker/geoserver/geoserver_data/security/pwpolicy/default/config.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<passwordPolicy>
-  <id>58d57299:1813eece7c0:-7ff6</id>
-  <name>default</name>
-  <className>org.geoserver.security.validation.PasswordValidatorImpl</className>
-  <uppercaseRequired>false</uppercaseRequired>
-  <lowercaseRequired>false</lowercaseRequired>
-  <digitRequired>false</digitRequired>
-  <minLength>0</minLength>
-  <maxLength>-1</maxLength>
-</passwordPolicy>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/pwpolicy/master/config.xml b/docker/geoserver/geoserver_data/security/pwpolicy/master/config.xml
deleted file mode 100644
index d7b216f..0000000
--- a/docker/geoserver/geoserver_data/security/pwpolicy/master/config.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<passwordPolicy>
-  <id>58d57299:1813eece7c0:-7ff5</id>
-  <name>master</name>
-  <className>org.geoserver.security.validation.PasswordValidatorImpl</className>
-  <uppercaseRequired>false</uppercaseRequired>
-  <lowercaseRequired>false</lowercaseRequired>
-  <digitRequired>false</digitRequired>
-  <minLength>8</minLength>
-  <maxLength>-1</maxLength>
-</passwordPolicy>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/rest.properties b/docker/geoserver/geoserver_data/security/rest.properties
deleted file mode 100644
index f6c23a3..0000000
--- a/docker/geoserver/geoserver_data/security/rest.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# Default REST security configuration.
-# 
-# By default this configuration locks down every rest call. The following is an example of a more
-# lax configuration in which read only (GET) access is allowed anonymously:
-# 
-#/**;GET=IS_AUTHENTICATED_ANONYMOUSLY
-#/**;POST,DELETE,PUT=ROLE_ADMINISTRATOR
-#
-# The following is an example of a configuration that could be used with the restconfig plugin in 
-# which only configuration in a specific workspace is restricted:
-#
-#/rest/workspaces/topp*;GET=ROLE_ADMINISTRATOR
-#/rest/workspaces/topp/**;GET=ROLE_ADMINISTRATOR
-#/**;POST,DELETE,PUT=ROLE_ADMINISTRATOR
-#
-# Next line enables access to user self-admin operations (such as changing own password):
-# 
-#/rest/security/self/**;PUT=ROLE_AUTHENTICATED
-#
-#
-/**;GET=ROLE_ADMINISTRATOR
-/**;POST,DELETE,PUT=ROLE_ADMINISTRATOR
diff --git a/docker/geoserver/geoserver_data/security/role/default/config.xml b/docker/geoserver/geoserver_data/security/role/default/config.xml
deleted file mode 100644
index 4269b5c..0000000
--- a/docker/geoserver/geoserver_data/security/role/default/config.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<roleService>
-  <id>58d57299:1813eece7c0:-7ff3</id>
-  <name>default</name>
-  <className>org.geoserver.security.xml.XMLRoleService</className>
-  <fileName>roles.xml</fileName>
-  <checkInterval>10000</checkInterval>
-  <validating>true</validating>
-  <adminRoleName>ADMIN</adminRoleName>
-  <groupAdminRoleName>GROUP_ADMIN</groupAdminRoleName>
-</roleService>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/role/default/roles.xml b/docker/geoserver/geoserver_data/security/role/default/roles.xml
deleted file mode 100644
index 5e2c9d5..0000000
--- a/docker/geoserver/geoserver_data/security/role/default/roles.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><roleRegistry xmlns="http://www.geoserver.org/security/roles" version="1.0">
-<roleList>
-<role id="ADMIN"/>
-<role id="GROUP_ADMIN"/>
-</roleList>
-<userList>
-<userRoles username="admin">
-<roleRef roleID="ADMIN"/>
-</userRoles>
-</userList>
-<groupList/>
-</roleRegistry>
diff --git a/docker/geoserver/geoserver_data/security/role/default/roles.xsd b/docker/geoserver/geoserver_data/security/role/default/roles.xsd
deleted file mode 100644
index f7a08fc..0000000
--- a/docker/geoserver/geoserver_data/security/role/default/roles.xsd
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.geoserver.org/security/roles" xmlns:gsr="http://www.geoserver.org/security/roles" elementFormDefault="qualified">
-
-
-    <element name="roleRegistry" type="gsr:RoleRegistryType">
-        <key name="RoleKey">
-    		<selector xpath="gsr:roleList/gsr:role"/>
-    		<field xpath="@id"/>
-    	</key>
-    	<keyref name="ParentKey" refer="gsr:RoleKey">
-    		<selector xpath="gsr:roleList/gsr:role"/>
-    		<field xpath="@parentID"/>
-    	</keyref>
-    	<keyref name="UserRoleKey" refer="gsr:RoleKey">
-    		<selector xpath="gsr:userList/gsr:userRoles/gsr:roleRef"/>
-    		<field xpath="@roleID"/>
-    	</keyref>        	    
-    	<keyref name="GroupRoleKey" refer="gsr:RoleKey">
-    		<selector xpath="gsr:groupList/gsr:groupRoles/gsr:roleRef"/>
-    		<field xpath="@roleID"/>
-    	</keyref>        	        	        	    
-    </element>
-    
-    <complexType name="RoleType">
-       	<sequence>
-    		<element name="property" type="gsr:RolePropertyType" minOccurs="0" maxOccurs="unbounded"/> 
-    	</sequence>    	    
-    	<attribute name="id" type="string" use="required"></attribute>
-    	<attribute name="parentID" type="string" use="optional"></attribute>
-    </complexType>
-    
-    <complexType name="RoleRefType">
-    	<attribute name="roleID" type="string" use="required"></attribute>
-    </complexType>
-    
-    
-
-    <complexType name="RoleRegistryType">
-    	<sequence>
-    		<element name="roleList" type="gsr:RoleListType" minOccurs="1" maxOccurs="1"></element>
-    		<element name="userList" type="gsr:UserRolesType" minOccurs="1" maxOccurs="1"></element>
-    		<element name="groupList" type="gsr:GroupRolesType" minOccurs="1" maxOccurs="1"></element>
-    	</sequence>
-    	<attribute name="version" type="gsr:VersionType" use="required" ></attribute>    	
-    </complexType>
-
-    <complexType name="RoleListType">
-    	<sequence>
-    		<element name="role" type="gsr:RoleType" minOccurs="0" maxOccurs="unbounded"></element>
-    	</sequence>
-    </complexType>
-    
-    <complexType name="UserRoleRefListType">
-    	<sequence>
-    		<element name="roleRef" type="gsr:RoleRefType" minOccurs="0"
-    			maxOccurs="unbounded">
-    		</element>
-    	</sequence>
-    	<attribute name="username" type="string" use="required"></attribute>
-    </complexType>
-    
-    <complexType name="GroupRoleRefListType">
-    	<sequence>
-    		<element name="roleRef" type="gsr:RoleRefType" minOccurs="0"
-    			maxOccurs="unbounded">
-    		</element>
-    	</sequence>
-    	<attribute name="groupname" type="string" use="required"></attribute>
-    </complexType>
-    
-    <complexType name="GroupRolesType">
-    	<sequence>
-    		<element name="groupRoles" type="gsr:GroupRoleRefListType" minOccurs="0"
-    			maxOccurs="unbounded">
-    		</element>
-    	</sequence>
-    </complexType>
-    
-    <complexType name="UserRolesType">
-    	<sequence>
-    		<element name="userRoles" type="gsr:UserRoleRefListType" minOccurs="0"
-    			maxOccurs="unbounded">
-    		</element>
-    	</sequence>
-    </complexType>
-    
-    <complexType name="RolePropertyType">
-    	<simpleContent>
-    		<extension base="string">
-    			<attribute name="name" type="string" use="required"></attribute>
-    		</extension>
-    	</simpleContent>
-    </complexType>
-
-    <simpleType name="VersionType" >
-    	<restriction base="string">
-    		<enumeration value="1.0"></enumeration>
-    	</restriction>
-    </simpleType>
-    
-            
-</schema>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/services.properties b/docker/geoserver/geoserver_data/security/services.properties
deleted file mode 100644
index f4cfbe8..0000000
--- a/docker/geoserver/geoserver_data/security/services.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# The format here is service[.method]=ROLE1,...,ROLEN
-# ([method] being optional if you want to apply the rule to all calls to a specific service
-# A user can access a service only if he has one of the specified roles
-# If not specified in this file, a service or method will be considered unsecured
-
-# Uncomment the following config if you want to test securing WFS service
-#wfs.GetFeature=ROLE_WFS_READ
-#wfs.Transaction=ROLE_WFS_WRITE
-wfs.DropStoredQuery=ADMIN,GROUP_ADMIN
-wfs.CreateStoredQuery=ADMIN,GROUP_ADMIN
diff --git a/docker/geoserver/geoserver_data/security/usergroup/default/config.xml b/docker/geoserver/geoserver_data/security/usergroup/default/config.xml
deleted file mode 100644
index 668e868..0000000
--- a/docker/geoserver/geoserver_data/security/usergroup/default/config.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<userGroupService>
-  <id>58d57299:1813eece7c0:-7ff4</id>
-  <name>default</name>
-  <className>org.geoserver.security.xml.XMLUserGroupService</className>
-  <fileName>users.xml</fileName>
-  <checkInterval>10000</checkInterval>
-  <validating>true</validating>
-  <passwordEncoderName>pbePasswordEncoder</passwordEncoderName>
-  <passwordPolicyName>default</passwordPolicyName>
-</userGroupService>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/usergroup/default/users.xml b/docker/geoserver/geoserver_data/security/usergroup/default/users.xml
deleted file mode 100644
index 34b3377..0000000
--- a/docker/geoserver/geoserver_data/security/usergroup/default/users.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><userRegistry xmlns="http://www.geoserver.org/security/users" version="1.0">
-<users>
-<user enabled="true" name="admin" password="crypt1:mlcijznfW1BBYriX66UCf8DHu9GVpyOr"/>
-</users>
-<groups/>
-</userRegistry>
diff --git a/docker/geoserver/geoserver_data/security/usergroup/default/users.xsd b/docker/geoserver/geoserver_data/security/usergroup/default/users.xsd
deleted file mode 100644
index 086b97d..0000000
--- a/docker/geoserver/geoserver_data/security/usergroup/default/users.xsd
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.geoserver.org/security/users" xmlns:gsu="http://www.geoserver.org/security/users" elementFormDefault="qualified">
-
-
-    <element name="userRegistry" type="gsu:UserRegistryType">
-        <key name="UserKey">
-    		<selector xpath="gsu:users/gsu:user"/>
-    		<field xpath="@name"/>
-    	</key>
-    	<key name="GroupKey">
-        	<selector xpath="gsu:groups/gsu:group"/>
-        	<field xpath="@name"/>
-		</key>
-		<keyref name="ForeinUserKey" refer="gsu:UserKey">  
-  			<selector xpath="gsu:groups/gsu:group/gsu:member"/>
-  			<field xpath="@username"/>
-		</keyref>    				    		    		    	    		    
-    </element>
-    
-    <complexType name="UserType">
-       	<sequence>
-    		<element name="property" type="gsu:UserPropertyType" minOccurs="0" maxOccurs="unbounded"/> 
-    	</sequence>    	
-    
-    	<attribute name="name" type="string" use="required"></attribute>
-    	<attribute name="password" type="string" use="optional"></attribute>
-    	<attribute name="enabled" type="boolean" use="optional" default="true"></attribute>
-    </complexType>
-    
-    <complexType name="GroupType">
-    	<sequence>    		
-    		<!--<element name="member" type="gsu:UserRefType" minOccurs="0" maxOccurs="unbounded"></element> -->
-    		<element name="member" type="gsu:UserRefType" minOccurs="0" maxOccurs="unbounded">
-    		</element>
-    	</sequence>    
-    	<attribute name="name" type="string" use="required"></attribute>
-    	<attribute name="enabled" type="boolean" use="optional" default="true"></attribute>
-    </complexType>
-    
-    
-    <complexType name="UserRefType">
-    	<attribute name="username" type="string" use="required"></attribute>
-    </complexType>
-    
-    
-
-    <complexType name="UserRegistryType">
-    	<sequence>    		
-    		<element name="users" type="gsu:UsersType" minOccurs="1" maxOccurs="1" />
-    		<element name="groups" type="gsu:GroupsType" minOccurs="1" maxOccurs="1"/>
-    	</sequence>
-    	<attribute  name="version" type="gsu:VersionType" use="required" ></attribute>
-    </complexType>
-    
-    <complexType name="UsersType">
-    	<sequence>
-    		<element name="user" type="gsu:UserType" minOccurs="0"
-    			maxOccurs="unbounded">
-    		</element>
-    	</sequence>
-    </complexType>
-    
-    <complexType name="GroupsType">
-    	<sequence>
-    		<element name="group" type="gsu:GroupType" minOccurs="0"
-    			maxOccurs="unbounded">
-    		</element>
-    	</sequence>    	
-    </complexType>
-    
-                    
-    <complexType name="UserPropertyType">
-    	<simpleContent>
-    		<extension base="string">
-    			<attribute name="name" type="string" use="required"></attribute>
-    		</extension>
-    	</simpleContent>
-    </complexType>
-
-    <simpleType name="VersionType" >
-    	<restriction base="string">
-    		<enumeration value="1.0"></enumeration>
-    	</restriction>
-    </simpleType>
-</schema>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/security/version.properties b/docker/geoserver/geoserver_data/security/version.properties
deleted file mode 100644
index 473df55..0000000
--- a/docker/geoserver/geoserver_data/security/version.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Current version of the security directory. Do not remove or alter this file
-#Tue Jun 07 16:08:48 GMT 2022
-version=2.5
diff --git a/docker/geoserver/geoserver_data/styles/default_generic.sld b/docker/geoserver/geoserver_data/styles/default_generic.sld
deleted file mode 100644
index a08a68f..0000000
--- a/docker/geoserver/geoserver_data/styles/default_generic.sld
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<StyledLayerDescriptor version="1.0.0" 
-                       xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd" 
-                       xmlns="http://www.opengis.net/sld" 
-                       xmlns:ogc="http://www.opengis.net/ogc" 
-                       xmlns:xlink="http://www.w3.org/1999/xlink" 
-                       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <NamedLayer>
-    <Name>generic</Name>
-    <UserStyle>
-      <Title>Generic</Title>
-      <Abstract>Generic style</Abstract>
-      <FeatureTypeStyle>
-        <Rule>
-          <Name>raster</Name>
-          <Title>Opaque Raster</Title>
-          <ogc:Filter>
-            <ogc:PropertyIsEqualTo>
-              <ogc:Function name="isCoverage"/>
-              <ogc:Literal>true</ogc:Literal>
-            </ogc:PropertyIsEqualTo>
-          </ogc:Filter>
-          <RasterSymbolizer>
-            <Opacity>1.0</Opacity>
-          </RasterSymbolizer>
-        </Rule>
-        <Rule>
-          <Name>Polygon</Name>
-          <Title>Grey Polygon</Title>
-          <ogc:Filter>
-            <ogc:PropertyIsEqualTo>
-              <ogc:Function name="dimension">
-                <ogc:Function name="geometry"/>
-              </ogc:Function>
-              <ogc:Literal>2</ogc:Literal>
-            </ogc:PropertyIsEqualTo>
-          </ogc:Filter>
-          <PolygonSymbolizer>
-            <Fill>
-              <CssParameter name="fill">#AAAAAA</CssParameter>
-            </Fill>
-            <Stroke>
-              <CssParameter name="stroke">#000000</CssParameter>
-              <CssParameter name="stroke-width">1</CssParameter>
-            </Stroke>
-          </PolygonSymbolizer>
-        </Rule>
-        <Rule>
-          <Name>Line</Name>
-          <Title>Blue Line</Title>
-          <ogc:Filter>
-            <ogc:PropertyIsEqualTo>
-              <ogc:Function name="dimension">
-                <ogc:Function name="geometry"/>
-              </ogc:Function>
-              <ogc:Literal>1</ogc:Literal>
-            </ogc:PropertyIsEqualTo>
-          </ogc:Filter>
-          <LineSymbolizer>
-            <Stroke>
-              <CssParameter name="stroke">#0000FF</CssParameter>
-              <CssParameter name="stroke-opacity">1</CssParameter>
-            </Stroke>
-          </LineSymbolizer>
-        </Rule>
-        <Rule>
-          <Name>point</Name>
-          <Title>Red Square Point</Title>
-          <ElseFilter/>
-          <PointSymbolizer>
-            <Graphic>
-              <Mark>
-                <WellKnownName>square</WellKnownName>
-                <Fill>
-                  <CssParameter name="fill">#FF0000</CssParameter>
-                </Fill>
-              </Mark>
-              <Size>6</Size>
-            </Graphic>
-          </PointSymbolizer>
-        </Rule>
-        <VendorOption name="ruleEvaluation">first</VendorOption>
-      </FeatureTypeStyle>
-    </UserStyle>
-  </NamedLayer>
-</StyledLayerDescriptor>
diff --git a/docker/geoserver/geoserver_data/styles/default_line.sld b/docker/geoserver/geoserver_data/styles/default_line.sld
deleted file mode 100644
index 626ebcf..0000000
--- a/docker/geoserver/geoserver_data/styles/default_line.sld
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<StyledLayerDescriptor version="1.0.0"
-		xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
-		xmlns="http://www.opengis.net/sld"
-		xmlns:ogc="http://www.opengis.net/ogc"
-		xmlns:xlink="http://www.w3.org/1999/xlink"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-		<!-- a named layer is the basic building block of an sld document -->
-
-	<NamedLayer>
-		<Name>Default Line</Name>
-		<UserStyle>
-		    <!-- they have names, titles and abstracts -->
-
-			<Title>Blue Line</Title>
-			<Abstract>A sample style that just prints out a blue line</Abstract>
-			<!-- FeatureTypeStyles describe how to render different features -->
-			<!-- a feature type for lines -->
-
-			<FeatureTypeStyle>
-				<!--FeatureTypeName>Feature</FeatureTypeName-->
-				<Rule>
-					<Name>Rule 1</Name>
-					<Title>Blue Line</Title>
-					<Abstract>A blue line with a 1 pixel width</Abstract>
-
-					<!-- like a polygonsymbolizer -->
-					<LineSymbolizer>
-						<Stroke>
-							<CssParameter name="stroke">#0000FF</CssParameter>
-						</Stroke>
-					</LineSymbolizer>
-				</Rule>
-
-		    </FeatureTypeStyle>
-		</UserStyle>
-	</NamedLayer>
-</StyledLayerDescriptor>
diff --git a/docker/geoserver/geoserver_data/styles/default_point.sld b/docker/geoserver/geoserver_data/styles/default_point.sld
deleted file mode 100644
index 68307d5..0000000
--- a/docker/geoserver/geoserver_data/styles/default_point.sld
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<StyledLayerDescriptor version="1.0.0"
-		xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
-		xmlns="http://www.opengis.net/sld"
-		xmlns:ogc="http://www.opengis.net/ogc"
-		xmlns:xlink="http://www.w3.org/1999/xlink"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-		<!-- a named layer is the basic building block of an sld document -->
-
-	<NamedLayer>
-		<Name>Default Point</Name>
-		<UserStyle>
-		    <!-- they have names, titles and abstracts -->
-
-			<Title>Red Square point</Title>
-			<Abstract>A sample style that just prints out a red square</Abstract>
-			<!-- FeatureTypeStyles describe how to render different features -->
-			<!-- a feature type for points -->
-
-			<FeatureTypeStyle>
-				<!--FeatureTypeName>Feature</FeatureTypeName-->
-				<Rule>
-					<Name>Rule 1</Name>
-					<Title>Red Square point</Title>
-					<Abstract>A red fill with 6 pixels size</Abstract>
-
-					<!-- like a linesymbolizer but with a fill too -->
-					<PointSymbolizer>
-						<Graphic>
-							<Mark>
-								<WellKnownName>square</WellKnownName>
-								<Fill>
-									<CssParameter name="fill">#FF0000</CssParameter>
-								</Fill>
-							</Mark>
-							<Size>6</Size>
-						</Graphic>
-					</PointSymbolizer>
-				</Rule>
-
-		    </FeatureTypeStyle>
-		</UserStyle>
-	</NamedLayer>
-</StyledLayerDescriptor>
diff --git a/docker/geoserver/geoserver_data/styles/default_polygon.sld b/docker/geoserver/geoserver_data/styles/default_polygon.sld
deleted file mode 100644
index 292e9d3..0000000
--- a/docker/geoserver/geoserver_data/styles/default_polygon.sld
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<StyledLayerDescriptor version="1.0.0"
-    xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
-    xmlns="http://www.opengis.net/sld"
-    xmlns:ogc="http://www.opengis.net/ogc"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <!-- a named layer is the basic building block of an sld document -->
-
-  <NamedLayer>
-    <Name>Default Polygon</Name>
-    <UserStyle>
-        <!-- they have names, titles and abstracts -->
-
-      <Title>Grey Polygon</Title>
-      <Abstract>A sample style that just prints out a grey interior with a black outline</Abstract>
-      <!-- FeatureTypeStyles describe how to render different features -->
-      <!-- a feature type for polygons -->
-
-      <FeatureTypeStyle>
-        <!--FeatureTypeName>Feature</FeatureTypeName-->
-        <Rule>
-          <Name>Rule 1</Name>
-          <Title>Grey Fill and Black Outline</Title>
-          <Abstract>Grey fill with a black outline 1 pixel in width</Abstract>
-
-          <!-- like a linesymbolizer but with a fill too -->
-          <PolygonSymbolizer>
-            <Fill>
-              <CssParameter name="fill">#AAAAAA</CssParameter>
-            </Fill>
-            <Stroke>
-              <CssParameter name="stroke">#000000</CssParameter>
-              <CssParameter name="stroke-width">1</CssParameter>
-            </Stroke>
-          </PolygonSymbolizer>
-        </Rule>
-
-        </FeatureTypeStyle>
-    </UserStyle>
-  </NamedLayer>
-</StyledLayerDescriptor>
diff --git a/docker/geoserver/geoserver_data/styles/default_raster.sld b/docker/geoserver/geoserver_data/styles/default_raster.sld
deleted file mode 100644
index c016647..0000000
--- a/docker/geoserver/geoserver_data/styles/default_raster.sld
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<StyledLayerDescriptor xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/sld
-http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd" version="1.0.0">
-<UserLayer>
-	<Name>raster_layer</Name>
-	<UserStyle>
-		<Name>raster</Name>
-		<Title>Opaque Raster</Title>
-		<Abstract>A sample style for rasters</Abstract>
-		<FeatureTypeStyle>
-	        <FeatureTypeName>Feature</FeatureTypeName>
-			<Rule>
-				<RasterSymbolizer>
-				    <Opacity>1.0</Opacity>
-				</RasterSymbolizer>
-			</Rule>
-		</FeatureTypeStyle>
-	</UserStyle>
-</UserLayer>
-</StyledLayerDescriptor>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/styles/generic.xml b/docker/geoserver/geoserver_data/styles/generic.xml
deleted file mode 100644
index d66c910..0000000
--- a/docker/geoserver/geoserver_data/styles/generic.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<style>
-  <id>StyleInfoImpl-58d57299:1813eece7c0:-7ffc</id>
-  <name>generic</name>
-  <format>sld</format>
-  <languageVersion>
-    <version>1.0.0</version>
-  </languageVersion>
-  <filename>default_generic.sld</filename>
-</style>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/styles/line.xml b/docker/geoserver/geoserver_data/styles/line.xml
deleted file mode 100644
index 7e72cb9..0000000
--- a/docker/geoserver/geoserver_data/styles/line.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<style>
-  <id>StyleInfoImpl-58d57299:1813eece7c0:-7fff</id>
-  <name>line</name>
-  <format>sld</format>
-  <languageVersion>
-    <version>1.0.0</version>
-  </languageVersion>
-  <filename>default_line.sld</filename>
-</style>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/styles/point.xml b/docker/geoserver/geoserver_data/styles/point.xml
deleted file mode 100644
index 6890585..0000000
--- a/docker/geoserver/geoserver_data/styles/point.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<style>
-  <id>StyleInfoImpl-58d57299:1813eece7c0:-8000</id>
-  <name>point</name>
-  <format>sld</format>
-  <languageVersion>
-    <version>1.0.0</version>
-  </languageVersion>
-  <filename>default_point.sld</filename>
-</style>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/styles/polygon.xml b/docker/geoserver/geoserver_data/styles/polygon.xml
deleted file mode 100644
index c9181a8..0000000
--- a/docker/geoserver/geoserver_data/styles/polygon.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<style>
-  <id>StyleInfoImpl-58d57299:1813eece7c0:-7ffe</id>
-  <name>polygon</name>
-  <format>sld</format>
-  <languageVersion>
-    <version>1.0.0</version>
-  </languageVersion>
-  <filename>default_polygon.sld</filename>
-</style>
\ No newline at end of file
diff --git a/docker/geoserver/geoserver_data/styles/raster.xml b/docker/geoserver/geoserver_data/styles/raster.xml
deleted file mode 100644
index ea42579..0000000
--- a/docker/geoserver/geoserver_data/styles/raster.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<style>
-  <id>StyleInfoImpl-58d57299:1813eece7c0:-7ffd</id>
-  <name>raster</name>
-  <format>sld</format>
-  <languageVersion>
-    <version>1.0.0</version>
-  </languageVersion>
-  <filename>default_raster.sld</filename>
-</style>
\ No newline at end of file
diff --git a/src/main/resources/org/geoserver/wms/web/data/geostyler-init.ftl b/src/main/resources/org/geoserver/wms/web/data/geostyler-init.ftl
index 55e3d97..eac5cee 100644
--- a/src/main/resources/org/geoserver/wms/web/data/geostyler-init.ftl
+++ b/src/main/resources/org/geoserver/wms/web/data/geostyler-init.ftl
@@ -135,7 +135,7 @@
       },
       requestParams: {
         version: '2.0.0',
-        typeName: layerNames,
+        typeNames: layerNames,
         srsName: 'EPSG:4326',
         count: 1
       },