diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
index e95ce738e9..4c7ce12133 100644
--- a/pkg/utils/utils.go
+++ b/pkg/utils/utils.go
@@ -42,7 +42,7 @@ import (
 	"go.step.sm/crypto/randutil"
 
 	// gocritic is disabled because google.golang.org/protobuf/proto does not provide a method to convert MessageV1 to MessageV2.
-	"github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/proto" //nolint:staticcheck
 	"google.golang.org/protobuf/encoding/protojson"
 )
 
diff --git a/tests/docker/docker-compose.yml b/tests/docker/docker-compose.yml
index 580cbe065f..f8736bc6ec 100644
--- a/tests/docker/docker-compose.yml
+++ b/tests/docker/docker-compose.yml
@@ -239,24 +239,6 @@ services:
       interval: 5s
       timeout: 5s
       retries: 5
-  storage-home-s3ng:
-    extends: revad
-    hostname: storage-home
-    command: -c /etc/revad/storage-home-s3ng.toml
-    volumes:
-      - shared-volume:/var/tmp
-    depends_on:
-      ceph:
-        condition: service_healthy
-  storage-users-s3ng:
-    extends: revad
-    hostname: storage-users
-    command: -c /etc/revad/storage-users-s3ng.toml
-    volumes:
-      - shared-volume:/var/tmp
-    depends_on:
-      ceph:
-        condition: service_healthy
   acceptance-3:
     extends: acceptance
     environment:
@@ -286,10 +268,6 @@ services:
         condition: service_healthy
       ldap-users:
         condition: service_healthy
-      storage-home-s3ng:
-        condition: service_healthy
-      storage-users-s3ng:
-        condition: service_healthy
       
 volumes:
   shared-volume:
diff --git a/tests/revad/storage-home-ocis.toml b/tests/revad/storage-home-ocis.toml
index e7c7f572df..8d2b607865 100644
--- a/tests/revad/storage-home-ocis.toml
+++ b/tests/revad/storage-home-ocis.toml
@@ -33,7 +33,7 @@ enable_home = true
 address = "0.0.0.0:12001"
 
 [http.services.dataprovider]
-driver = "local"
+driver = "localhome"
 temp_folder = "/var/tmp/reva/tmp"
 
 [http.services.dataprovider.drivers.localhome]
diff --git a/tests/revad/storage-local-1.toml b/tests/revad/storage-local-1.toml
index 752b3402e6..0e8409655a 100644
--- a/tests/revad/storage-local-1.toml
+++ b/tests/revad/storage-local-1.toml
@@ -30,5 +30,5 @@ address = "0.0.0.0:11101"
 driver = "local"
 temp_folder = "/var/tmp/reva/tmp"
 
-[http.services.dataprovider.drivers.ocis]
+[http.services.dataprovider.drivers.local]
 root = "/var/tmp/reva/data-local-1"