diff --git a/01/ambil_data.php b/01/ambil_data.php
index 3f537d5..0e6d094 100644
--- a/01/ambil_data.php
+++ b/01/ambil_data.php
@@ -1,7 +1,7 @@
 <?php
 include 'koneksi.php';
 
-$result = $koneksi->query("SELECT * FROM spbu");
+$result = $koneksi->query("SELECT * FROM spbu_01");
 
 $data = [];
 while($row = $result->fetch_assoc()){
diff --git a/01/hapus.php b/01/hapus.php
index fc40ed4..efb3f6c 100644
--- a/01/hapus.php
+++ b/01/hapus.php
@@ -3,7 +3,7 @@ include 'koneksi.php';
 
 $id = $_POST['id'];
 
-$stmt = $koneksi->prepare("DELETE FROM spbu WHERE id=?");
+$stmt = $koneksi->prepare("DELETE FROM spbu_01 WHERE id=?");
 $stmt->bind_param("i", $id);
 
 echo $stmt->execute() ? "success" : "error";
diff --git a/01/koneksi.php b/01/koneksi.php
index 031d157..1b6d218 100644
--- a/01/koneksi.php
+++ b/01/koneksi.php
@@ -2,7 +2,7 @@
 $host = getenv('DB_HOST') ?: 'db';
 $user = getenv('DB_USER') ?: 'root';
 $pass = getenv('DB_PASSWORD') ?: 'rootpassword';
-$db   = 'db_spbu';
+$db   = getenv('DB_NAME') ?: 'uas_06';
 
 $conn = @mysqli_connect($host, $user, $pass, $db);
 
diff --git a/01/simpan.php b/01/simpan.php
index 2bc1a73..86dfa96 100644
--- a/01/simpan.php
+++ b/01/simpan.php
@@ -5,7 +5,7 @@ $nama = $_POST['nama'];
 $lat = $_POST['lat'];
 $lng = $_POST['lng'];
 
-$stmt = $koneksi->prepare("INSERT INTO spbu (nama_spbu, lat, lng) VALUES (?, ?, ?)");
+$stmt = $koneksi->prepare("INSERT INTO spbu_01 (nama_spbu, lat, lng) VALUES (?, ?, ?)");
 $stmt->bind_param("sdd", $nama, $lat, $lng);
 
 echo $stmt->execute() ? "success" : "error";
diff --git a/01/update.php b/01/update.php
index f32a9dc..73d8ee0 100644
--- a/01/update.php
+++ b/01/update.php
@@ -6,7 +6,7 @@ $nama = $_POST['nama'];
 $lat = $_POST['lat'];
 $lng = $_POST['lng'];
 
-$stmt = $koneksi->prepare("UPDATE spbu SET nama_spbu=?, lat=?, lng=? WHERE id=?");
+$stmt = $koneksi->prepare("UPDATE spbu_01 SET nama_spbu=?, lat=?, lng=? WHERE id=?");
 $stmt->bind_param("sddi", $nama, $lat, $lng, $id);
 
 echo $stmt->execute() ? "success" : "error";
diff --git a/02/db.php b/02/db.php
index 4397439..49fbe00 100644
--- a/02/db.php
+++ b/02/db.php
@@ -3,6 +3,6 @@
 $host = getenv('DB_HOST') ?: 'db';
 $user = getenv('DB_USER') ?: 'root';
 $pass = getenv('DB_PASSWORD') ?: 'rootpassword';
-$db   = '02_kerusakan';
+$db   = getenv('DB_NAME') ?: 'uas_06';
 
 $conn = @mysqli_connect($host, $user, $pass, $db);
diff --git a/04/ambil_data.php b/04/ambil_data.php
index 7adfbff..c3ebe73 100644
--- a/04/ambil_data.php
+++ b/04/ambil_data.php
@@ -3,7 +3,7 @@ include 'koneksi.php';
 
 $data = [];
 
-$result = $conn->query("SELECT * FROM spbu");
+$result = $conn->query("SELECT * FROM spbu_04");
 
 if ($result) {
     while ($row = $result->fetch_assoc()) {
diff --git a/04/hapus.php b/04/hapus.php
index 147dfde..878d27e 100644
--- a/04/hapus.php
+++ b/04/hapus.php
@@ -5,7 +5,7 @@ ob_clean();
 
 $id = $conn->real_escape_string($_POST['id'] ?? '');
 
-$query = "DELETE FROM spbu WHERE id='$id'";
+$query = "DELETE FROM spbu_04 WHERE id='$id'";
 
 if ($conn->query($query)) {
     echo "success";
diff --git a/04/koneksi.php b/04/koneksi.php
index 749f0d6..0f040b8 100644
--- a/04/koneksi.php
+++ b/04/koneksi.php
@@ -2,7 +2,7 @@
 $host = getenv('DB_HOST') ?: 'db';
 $user = getenv('DB_USER') ?: 'root';
 $pass = getenv('DB_PASSWORD') ?: 'rootpassword';
-$db   = getenv('DB_NAME_04') ?: (getenv('DB_NAME') ?: 'db_24jam');
+$db   = getenv('DB_NAME') ?: 'uas_06';
 
 $conn = @mysqli_connect($host, $user, $pass, $db);
 
diff --git a/04/simpan.php b/04/simpan.php
index 49bed42..a56e2b6 100644
--- a/04/simpan.php
+++ b/04/simpan.php
@@ -9,8 +9,8 @@ $status = $conn->real_escape_string($_POST['status'] ?? '');
 $lat    = $conn->real_escape_string($_POST['lat']    ?? '');
 $lng    = $conn->real_escape_string($_POST['lng']    ?? '');
 
-$query = "INSERT INTO spbu (nama_spbu, no_wa, status, latitude, longitude)
-          VALUES ('$nama','$wa','$status','$lat','$lng')";
+$query = "INSERT INTO spbu_04 (nama_spbu, no_wa, status, latitude, longitude)
+          VALUES ('$nama', '$wa', '$status', $lat, $lng)";
 
 if ($conn->query($query)) {
     echo "success";
diff --git a/04/update.php b/04/update.php
index 1db56b7..0c8b371 100644
--- a/04/update.php
+++ b/04/update.php
@@ -10,7 +10,7 @@ $status = $conn->real_escape_string($_POST['status'] ?? '');
 $lat    = $conn->real_escape_string($_POST['lat']    ?? '');
 $lng    = $conn->real_escape_string($_POST['lng']    ?? '');
 
-$query = "UPDATE spbu SET 
+$query = "UPDATE spbu_04 SET 
     nama_spbu='$nama',
     no_wa='$wa',
     status='$status',
diff --git a/docker-compose.yml b/docker-compose.yml
index 41fc89d..87d2f29 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,9 +10,8 @@ services:
       - DB_HOST=db
       - DB_USER=root
       - DB_PASSWORD=rootpassword
-      # Nama-nama database (akan otomatis dibuat oleh MySQL container saat pertama kali jalan)
+      # Nama database utama
       - DB_NAME=uas_06
-      - DB_NAME_04=db_24jam
     restart: always
 
   db:
@@ -23,11 +22,8 @@ services:
       - ":3306"
     volumes:
       - db_data:/var/lib/mysql
-      # Auto-import semua database saat container pertama kali dibuat (volume kosong)
-      - ./01/db_spbu.sql:/docker-entrypoint-initdb.d/1_db_spbu.sql
-      - ./02/database.sql:/docker-entrypoint-initdb.d/2_database.sql
-      - ./04/db_spbu.sql:/docker-entrypoint-initdb.d/4_db_spbu.sql
-      - ./05/database_uas_06.sql:/docker-entrypoint-initdb.d/5_database_uas_06.sql
+      # Auto-import database terpadu
+      - ./init.sql:/docker-entrypoint-initdb.d/init.sql
     healthcheck:
       test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
       interval: 10s