diff --git a/delta/plugins/storage/src/main/resources/storage.conf b/delta/plugins/storage/src/main/resources/storage.conf
index f820b1b66c..2438c16ab3 100644
--- a/delta/plugins/storage/src/main/resources/storage.conf
+++ b/delta/plugins/storage/src/main/resources/storage.conf
@@ -44,7 +44,8 @@ plugins.storage {
       show-location = true
       # the default maximum allowed file size (in bytes) for uploaded files. 10 GB 
       default-max-file-size = 10737418240
-      default-bucket = "nexus-delta-production"
+      default-bucket = "default-bucket-override-me"
+      default-bucket = ${?DEFAULT_BUCKET}
     }
     # Remote disk storage configuration
     remote-disk {
diff --git a/ship/src/main/resources/ship-default.conf b/ship/src/main/resources/ship-default.conf
index 93c734017a..0e028ae570 100644
--- a/ship/src/main/resources/ship-default.conf
+++ b/ship/src/main/resources/ship-default.conf
@@ -41,7 +41,8 @@ ship {
   s-3 {
     endpoint = "https://s3.us-east-1.amazonaws.com"
     # the bucket which contains the import files
-    import-bucket = "nexus-ship-production"
+    import-bucket = "default-import-bucket"
+    import-bucket = ${?IMPORT_BUCKET}
 
   }
 
@@ -119,7 +120,8 @@ ship {
         show-location = true
         # the default maximum allowed file size (in bytes) for uploaded files. 10 GB
         default-max-file-size = 10737418240
-        default-bucket = "nexus-delta-production"
+        default-bucket = "default-target-bucket"
+        default-bucket = ${?TARGET_BUCKET}
       }
 
       # Disk storage configuration
@@ -183,7 +185,8 @@ ship {
       #prefix = "/some-prefix"
       import-bucket = ${ship.s-3.import-bucket}
       # The bucket to which the files will be copied by the Nexus Ship
-      target-bucket = "nexus-delta-production"
+      target-bucket = "default-target-bucket"
+      target-bucket = ${?TARGET_BUCKET}
       # To skip file events to make the batch run faster and focus on other events
       skip-file-events = false
       # Allows to define default media types for the given file extensions
diff --git a/ship/src/test/scala/ch/epfl/bluebrain/nexus/ship/config/ShipConfigFixtures.scala b/ship/src/test/scala/ch/epfl/bluebrain/nexus/ship/config/ShipConfigFixtures.scala
index bc37842944..170038357f 100644
--- a/ship/src/test/scala/ch/epfl/bluebrain/nexus/ship/config/ShipConfigFixtures.scala
+++ b/ship/src/test/scala/ch/epfl/bluebrain/nexus/ship/config/ShipConfigFixtures.scala
@@ -34,8 +34,8 @@ trait ShipConfigFixtures extends ConfigFixtures with StorageFixtures with Classp
     ServiceAccount(User("internal", Label.unsafe("sa")))
   )
 
-  private val importBucket = "nexus-ship-production"
-  private val targetBucket = "nexus-delta-production"
+  private val importBucket = "default-import-bucket"
+  private val targetBucket = "default-target-bucket"
 
   private val amazonConfig: S3StorageConfig =
     S3StorageConfig(