diff --git a/src/main/java/org/commonjava/service/storage/config/StorageServiceConfig.java b/src/main/java/org/commonjava/service/storage/config/StorageServiceConfig.java
index 6c57624..9c8b746 100644
--- a/src/main/java/org/commonjava/service/storage/config/StorageServiceConfig.java
+++ b/src/main/java/org/commonjava/service/storage/config/StorageServiceConfig.java
@@ -46,6 +46,6 @@ public interface StorageServiceConfig
     String type();
 
     @WithName( "bucket.name" )
-    @WithDefault( "" )
+    @WithDefault( "test" )
     String bucketName();
 }
diff --git a/src/main/java/org/commonjava/service/storage/core/FileManagerProducer.java b/src/main/java/org/commonjava/service/storage/core/FileManagerProducer.java
index 63deec0..ff52d82 100644
--- a/src/main/java/org/commonjava/service/storage/core/FileManagerProducer.java
+++ b/src/main/java/org/commonjava/service/storage/core/FileManagerProducer.java
@@ -65,11 +65,11 @@ public PathMappedFileManager getFileManager()
 
         if ( StorageServiceConfig.STORAGE_S3.equals( storageType ) )
         {
-            physicalStore = new FileBasedPhysicalStore( storageConfig.baseDir() );
+            physicalStore = new S3PhysicalStore( s3Client, storageConfig.bucketName() );
         }
         else
         {
-            physicalStore = new S3PhysicalStore( s3Client, storageConfig.bucketName() );
+            physicalStore = new FileBasedPhysicalStore( storageConfig.baseDir() );
         }
 
         return new PathMappedFileManager( config, pathDB, physicalStore );
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 641ee06..1100f70 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -70,9 +70,9 @@ storage:
     baseDir: "/tmp"
     readonly: false
     removableFilesystemPattern: ".+:(remote|group):.+"
-    type: s3
-    bucket:
-        name: test
+    #type: s3
+    #bucket:
+    #    name: test
 
 "%dev":
     quarkus: