diff --git a/internal/database/migrations/20251029074825_create_laying_transfers_table.up.sql b/internal/database/migrations/20251029074825_create_laying_transfers_table.up.sql
index 8677ca71..10ced117 100644
--- a/internal/database/migrations/20251029074825_create_laying_transfers_table.up.sql
+++ b/internal/database/migrations/20251029074825_create_laying_transfers_table.up.sql
@@ -2,7 +2,8 @@ CREATE TABLE IF NOT EXISTS laying_transfers (
     id BIGSERIAL PRIMARY KEY,
     from_project_flock_id BIGINT NOT NULL,
     to_project_flock_id BIGINT NOT NULL,
-    total_quantity INTEGER,
+    transfer_date DATE NOT NULL,
+    total_qty INTEGER,
     notes TEXT,
     created_at TIMESTAMPTZ DEFAULT now(),
     updated_at TIMESTAMPTZ DEFAULT now(),
@@ -36,7 +37,10 @@ BEGIN
 END $$;
 
 -- INDEXES
-CREATE INDEX IF NOT EXISTS idx_laying_transfers_from_project_flock_id ON laying_transfers(from_project_flock_id);
-CREATE INDEX IF NOT EXISTS idx_laying_transfers_to_project_flock_id ON laying_transfers(to_project_flock_id);
-CREATE INDEX IF NOT EXISTS idx_laying_transfers_created_by ON laying_transfers(created_by);
-CREATE INDEX IF NOT EXISTS idx_laying_transfers_deleted_at ON laying_transfers(deleted_at);
\ No newline at end of file
+CREATE INDEX IF NOT EXISTS idx_laying_transfers_from_project_flock_id ON laying_transfers (from_project_flock_id);
+
+CREATE INDEX IF NOT EXISTS idx_laying_transfers_to_project_flock_id ON laying_transfers (to_project_flock_id);
+
+CREATE INDEX IF NOT EXISTS idx_laying_transfers_created_by ON laying_transfers (created_by);
+
+CREATE INDEX IF NOT EXISTS idx_laying_transfers_deleted_at ON laying_transfers (deleted_at);
\ No newline at end of file
diff --git a/internal/database/migrations/20251030134228_refactor_project_chikins.up.sql b/internal/database/migrations/20251030134228_refactor_project_chikins.up.sql
new file mode 100644
index 00000000..98ac9b73
--- /dev/null
+++ b/internal/database/migrations/20251030134228_refactor_project_chikins.up.sql
@@ -0,0 +1,5 @@
+DROP TABLE IF EXISTS project_chickin_details;
+
+DROP TABLE IF EXISTS project_chickins;
+
+DROP TABLE IF EXISTS project_flock_populations;
\ No newline at end of file
diff --git a/internal/database/migrations/20251030134527_recreate_project_chikins_table.down.sql b/internal/database/migrations/20251030134527_recreate_project_chikins_table.down.sql
new file mode 100644
index 00000000..e69de29b
diff --git a/internal/database/migrations/20251030134527_recreate_project_chikins_table.up.sql b/internal/database/migrations/20251030134527_recreate_project_chikins_table.up.sql
new file mode 100644
index 00000000..c00765b1
--- /dev/null
+++ b/internal/database/migrations/20251030134527_recreate_project_chikins_table.up.sql
@@ -0,0 +1,58 @@
+-- ============================================
+-- MIGRATION: project_chickins
+-- ============================================
+
+-- STEP 1: Hapus tabel jika sudah ada
+
+-- STEP 2: Buat tabel project_chickins
+CREATE TABLE IF NOT EXISTS project_chickins (
+    id BIGSERIAL PRIMARY KEY,
+    project_flock_kandang_id BIGINT NOT NULL,
+    product_warehouse_id BIGINT NOT NULL,
+    chick_in_date DATE NOT NULL,
+    usage_qty NUMERIC(15, 3) NOT NULL,
+    pending_usage_qty NUMERIC(15, 3) DEFAULT 0,
+    notes TEXT,
+    created_by BIGINT NOT NULL,
+    created_at TIMESTAMPTZ DEFAULT now(),
+    updated_at TIMESTAMPTZ DEFAULT now(),
+    deleted_at TIMESTAMPTZ
+);
+
+-- STEP 3: FOREIGN KEYS
+DO $$
+BEGIN
+    -- Relasi ke project_flock_kandangs
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'project_flock_kandangs') THEN
+        ALTER TABLE project_chickins
+            ADD CONSTRAINT fk_project_chickins_kandang
+            FOREIGN KEY (project_flock_kandang_id)
+            REFERENCES project_flock_kandangs(id)
+            ON DELETE RESTRICT ON UPDATE CASCADE;
+    END IF;
+
+    -- Relasi ke product_warehouses
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'product_warehouses') THEN
+        ALTER TABLE project_chickins
+            ADD CONSTRAINT fk_project_chickins_warehouse
+            FOREIGN KEY (product_warehouse_id)
+            REFERENCES product_warehouses(id)
+            ON DELETE RESTRICT ON UPDATE CASCADE;
+    END IF;
+
+    -- Relasi ke users
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'users') THEN
+        ALTER TABLE project_chickins
+            ADD CONSTRAINT fk_project_chickins_created_by
+            FOREIGN KEY (created_by)
+            REFERENCES users(id)
+            ON DELETE RESTRICT ON UPDATE CASCADE;
+    END IF;
+END $$;
+
+-- STEP 4: INDEXES
+CREATE INDEX IF NOT EXISTS idx_chickins_kandang_id ON project_chickins (project_flock_kandang_id);
+
+CREATE INDEX IF NOT EXISTS idx_chickins_warehouse_id ON project_chickins (product_warehouse_id);
+
+CREATE INDEX IF NOT EXISTS idx_chickins_created_by ON project_chickins (created_by);
\ No newline at end of file
diff --git a/internal/database/migrations/20251030134542_recreate_project_flock_populations.down.sql b/internal/database/migrations/20251030134542_recreate_project_flock_populations.down.sql
new file mode 100644
index 00000000..e69de29b
diff --git a/internal/database/migrations/20251030134542_recreate_project_flock_populations.up.sql b/internal/database/migrations/20251030134542_recreate_project_flock_populations.up.sql
new file mode 100644
index 00000000..2cb76e8f
--- /dev/null
+++ b/internal/database/migrations/20251030134542_recreate_project_flock_populations.up.sql
@@ -0,0 +1,57 @@
+-- ============================================
+-- MIGRATION: project_flock_populations
+-- ============================================
+
+-- STEP 1: Hapus tabel jika sudah ada
+
+-- STEP 2: Buat tabel project_flock_populations
+CREATE TABLE IF NOT EXISTS project_flock_populations (
+    id BIGSERIAL PRIMARY KEY,
+    project_chickin_id BIGINT NOT NULL,
+    product_warehouse_id BIGINT NOT NULL,
+    total_qty NUMERIC(15, 3) NOT NULL,
+    total_used_qty NUMERIC(15, 3) DEFAULT 0,
+    notes TEXT,
+    created_by BIGINT NOT NULL,
+    created_at TIMESTAMPTZ DEFAULT now(),
+    updated_at TIMESTAMPTZ DEFAULT now(),
+    deleted_at TIMESTAMPTZ
+);
+
+-- STEP 3: FOREIGN KEYS
+DO $$
+BEGIN
+    -- Relasi ke project_chickins
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'project_chickins') THEN
+        ALTER TABLE project_flock_populations
+            ADD CONSTRAINT fk_project_flock_populations_chickin
+            FOREIGN KEY (project_chickin_id)
+            REFERENCES project_chickins(id)
+            ON DELETE RESTRICT ON UPDATE CASCADE;
+    END IF;
+
+    -- Relasi ke product_warehouses
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'product_warehouses') THEN
+        ALTER TABLE project_flock_populations
+            ADD CONSTRAINT fk_project_flock_populations_warehouse
+            FOREIGN KEY (product_warehouse_id)
+            REFERENCES product_warehouses(id)
+            ON DELETE RESTRICT ON UPDATE CASCADE;
+    END IF;
+
+    -- Relasi ke users
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'users') THEN
+        ALTER TABLE project_flock_populations
+            ADD CONSTRAINT fk_project_flock_populations_created_by
+            FOREIGN KEY (created_by)
+            REFERENCES users(id)
+            ON DELETE RESTRICT ON UPDATE CASCADE;
+    END IF;
+END $$;
+
+-- STEP 4: INDEXES
+CREATE INDEX IF NOT EXISTS idx_populations_chickin_id ON project_flock_populations (project_chickin_id);
+
+CREATE INDEX IF NOT EXISTS idx_populations_warehouse_id ON project_flock_populations (product_warehouse_id);
+
+CREATE INDEX IF NOT EXISTS idx_populations_created_by ON project_flock_populations (created_by);
\ No newline at end of file