diff --git a/smp-server-library/pom.xml b/smp-server-library/pom.xml
index 27898b2467151108a6e6aa39bc2890575e96d190..6f576d4bd513fc1958e588071202b1ecdb4d80bb 100644
--- a/smp-server-library/pom.xml
+++ b/smp-server-library/pom.xml
@@ -229,25 +229,6 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/resources</directory>
-                <filtering>true</filtering>
-                <excludes>
-                    <exclude>**/*.jks</exclude>
-                    <exclude>**/*.crt</exclude>
-                </excludes>
-            </testResource>
-            <testResource>
-                <directory>src/test/resources</directory>
-                <filtering>false</filtering>
-                <!-- With filtering=true Maven was introducing changes in keystore binary files [sic!] -->
-                <includes>
-                    <include>**/*.jks</include>
-                    <include>**/*.crt</include>
-                </includes>
-            </testResource>
-        </testResources>
         <plugins>
         <plugin>
             <artifactId>maven-antrun-plugin</artifactId>
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/AlertController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/AlertController.java
index d69b03ba588e6072756db341e1e4be122890e70b..eb5835554ef3b83d6727ceca8de69987b7a46732 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/AlertController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/AlertController.java
@@ -3,9 +3,11 @@ package eu.europa.ec.edelivery.smp.ui.internal;
 
 import eu.europa.ec.edelivery.smp.data.ui.AlertRO;
 import eu.europa.ec.edelivery.smp.data.ui.ServiceResult;
+import eu.europa.ec.edelivery.smp.data.ui.auth.SMPAuthority;
 import eu.europa.ec.edelivery.smp.logging.SMPLogger;
 import eu.europa.ec.edelivery.smp.logging.SMPLoggerFactory;
 import eu.europa.ec.edelivery.smp.services.ui.UIAlertService;
+import org.springframework.security.access.annotation.Secured;
 import org.springframework.util.MimeTypeUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,6 +33,7 @@ public class AlertController {
     }
 
     @GetMapping(produces = {MimeTypeUtils.APPLICATION_JSON_VALUE})
+    @Secured({SMPAuthority.S_AUTHORITY_TOKEN_SYSTEM_ADMIN})
     public ServiceResult<AlertRO> geDomainList(
             @RequestParam(value = PARAM_PAGINATION_PAGE, defaultValue = "0") int page,
             @RequestParam(value = PARAM_PAGINATION_PAGE_SIZE, defaultValue = "10") int pageSize,
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/PropertyController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/PropertyController.java
index 657efc21d9948ab476d67654f6a5d03ca8bf84ee..3b616fbb08abb601ebf560c7256c74e082fec87f 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/PropertyController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/PropertyController.java
@@ -36,7 +36,8 @@ public class PropertyController {
     }
 
     @GetMapping(produces = {MimeTypeUtils.APPLICATION_JSON_VALUE})
-    public ServiceResult<PropertyRO> gePropertyList(
+    @Secured({SMPAuthority.S_AUTHORITY_TOKEN_SYSTEM_ADMIN})
+    public ServiceResult<PropertyRO> getPropertyList(
             @RequestParam(value = PARAM_PAGINATION_PAGE, defaultValue = "0") int page,
             @RequestParam(value = PARAM_PAGINATION_PAGE_SIZE, defaultValue = "10") int pageSize,
             @RequestParam(value = PARAM_PAGINATION_ORDER_BY, required = false) String orderBy,