diff --git a/src/config/index.js b/src/config/index.js
index 5629e23..607e635 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -3,9 +3,9 @@ import { Pool } from 'pg'
 
 const database = {
 	host: process.env.DB_HOST,
-	user: process.env.DB_USER,
+	user: process.env.DB_USERNAME,
 	password: process.env.DB_PASSWORD,
-	database: process.env.DB_NAME,
+	database: process.env.DB_DATABASE,
 	port: parseInt(process.env.DB_PORT, 10),
 }
 
diff --git a/src/migrations/010_add-autogenerate-record-id-on-all-tables.js b/src/migrations/010_add-autogenerate-record-id-on-all-tables.js
new file mode 100644
index 0000000..f03a716
--- /dev/null
+++ b/src/migrations/010_add-autogenerate-record-id-on-all-tables.js
@@ -0,0 +1,75 @@
+export const up = (pgm) => {
+	pgm.sql(`
+        ALTER TABLE roles 
+        ALTER COLUMN id DROP DEFAULT,
+        ALTER COLUMN id SET DATA TYPE UUID USING (gen_random_uuid()),
+        ALTER COLUMN id SET DEFAULT gen_random_uuid();
+        `)
+	pgm.sql(`
+        ALTER TABLE images 
+        ALTER COLUMN id DROP DEFAULT,
+        ALTER COLUMN id SET DATA TYPE UUID USING (gen_random_uuid()),
+        ALTER COLUMN id SET DEFAULT gen_random_uuid();
+        `)
+	pgm.sql(`
+        ALTER TABLE collections 
+        ALTER COLUMN id DROP DEFAULT,
+        ALTER COLUMN id SET DATA TYPE UUID USING (gen_random_uuid()),
+        ALTER COLUMN id SET DEFAULT gen_random_uuid();
+        `)
+	pgm.sql(`
+        ALTER TABLE items 
+        ALTER COLUMN id DROP DEFAULT,
+        ALTER COLUMN id SET DATA TYPE UUID USING (gen_random_uuid()),
+        ALTER COLUMN id SET DEFAULT gen_random_uuid();
+        `)
+	pgm.sql(`
+        ALTER TABLE locations 
+        ALTER COLUMN id DROP DEFAULT,
+        ALTER COLUMN id SET DATA TYPE UUID USING (gen_random_uuid()),
+        ALTER COLUMN id SET DEFAULT gen_random_uuid();
+        `)
+	pgm.sql(`
+        ALTER TABLE sets 
+        ALTER COLUMN id DROP DEFAULT,
+        ALTER COLUMN id SET DATA TYPE UUID USING (gen_random_uuid()),
+        ALTER COLUMN id SET DEFAULT gen_random_uuid();
+        `)
+	pgm.sql(`
+        ALTER TABLE users 
+        ALTER COLUMN id DROP DEFAULT,
+        ALTER COLUMN id SET DATA TYPE UUID USING (gen_random_uuid()),
+        ALTER COLUMN id SET DEFAULT gen_random_uuid();
+        `)
+}
+
+export const down = (pmg) => {
+	pgm.sql(`
+        ALTER TABLE roles 
+        ALTER COLUMN id DROP DEFAULT;
+      `)
+	pgm.sql(`
+        ALTER TABLE images 
+        ALTER COLUMN id DROP DEFAULT;
+      `)
+	pgm.sql(`
+        ALTER TABLE collections 
+        ALTER COLUMN id DROP DEFAULT;
+      `)
+	pgm.sql(`
+        ALTER TABLE items 
+        ALTER COLUMN id DROP DEFAULT;
+      `)
+	pgm.sql(`
+        ALTER TABLE locations 
+        ALTER COLUMN id DROP DEFAULT;
+      `)
+	pgm.sql(`
+        ALTER TABLE sets 
+        ALTER COLUMN id DROP DEFAULT;
+      `)
+	pgm.sql(`
+        ALTER TABLE users 
+        ALTER COLUMN id DROP DEFAULT;
+      `)
+}