diff --git a/src/v2/index.ts b/src/v2/index.ts
index ff951ad..9bb3104 100644
--- a/src/v2/index.ts
+++ b/src/v2/index.ts
@@ -5,6 +5,8 @@ export { WebServerLoadBalancer } from './components/web-server/load-balancer';
 export { ElastiCacheRedis } from './components/redis/elasticache-redis';
 export { UpstashRedis } from './components/redis/upstash-redis';
 export { Vpc } from './components/vpc';
+export { Database } from './components/database';
+export { DatabaseBuilder } from './components/database/builder';
 export { AcmCertificate } from './components/acm-certificate';
 export { Password } from './components/password';
 
diff --git a/tests/build/index.tst.ts b/tests/build/index.tst.ts
index fa1d31e..bd3a3a4 100644
--- a/tests/build/index.tst.ts
+++ b/tests/build/index.tst.ts
@@ -4,8 +4,6 @@ import { describe, expect, it } from 'tstyche';
 import { next as studion } from '@studion/infra-code-blocks';
 import { OtelCollector } from '../../dist/v2/otel';
 import { OtelCollectorBuilder } from '../../dist/v2/otel/builder';
-import { Database } from '../../dist/v2/components/database';
-import { DatabaseBuilder } from '../../dist/v2/components/database/builder';
 
 describe('Build output', () => {
   describe('ECS Service', () => {
@@ -261,11 +259,13 @@ describe('Build output', () => {
   });
 
   describe('Database', () => {
-    it.skip('should export Database', () => {
+    const { Database, DatabaseBuilder } = studion;
+
+    it('should export Database', () => {
       expect(studion).type.toHaveProperty('Database');
     });
 
-    it.skip('should export DatabaseBuilder', () => {
+    it('should export DatabaseBuilder', () => {
       expect(studion).type.toHaveProperty('DatabaseBuilder');
     });
 
diff --git a/tests/database/infrastructure/index.ts b/tests/database/infrastructure/index.ts
index 3050be0..bc4e2b4 100644
--- a/tests/database/infrastructure/index.ts
+++ b/tests/database/infrastructure/index.ts
@@ -1,7 +1,6 @@
 import * as aws from '@pulumi/aws';
 import * as config from './config';
 import * as pulumi from '@pulumi/pulumi';
-import { DatabaseBuilder } from '../../../dist/v2/components/database/builder';
 import { next as studion } from '@studion/infra-code-blocks';
 
 const parent = new pulumi.ComponentResource(
@@ -11,7 +10,7 @@ const parent = new pulumi.ComponentResource(
 
 const vpc = new studion.Vpc(`${config.appName}-vpc`, {}, { parent });
 
-const defaultDb = new DatabaseBuilder(`${config.appName}-default-db`)
+const defaultDb = new studion.DatabaseBuilder(`${config.appName}-default-db`)
   .withInstance({
     dbName: config.dbName,
   })
@@ -44,7 +43,9 @@ const paramGroup = new aws.rds.ParameterGroup(
   { parent },
 );
 
-const configurableDb = new DatabaseBuilder(`${config.appName}-configurable-db`)
+const configurableDb = new studion.DatabaseBuilder(
+  `${config.appName}-configurable-db`,
+)
   .withInstance({
     dbName: config.dbName,
     applyImmediately: config.applyImmediately,
@@ -83,7 +84,7 @@ const snapshot = defaultDb.instance.dbInstanceIdentifier.apply(
 
 const snapshotDb = snapshot.apply(snapshot => {
   if (!snapshot) return;
-  return new DatabaseBuilder(`${config.appName}-snapshot-db`)
+  return new studion.DatabaseBuilder(`${config.appName}-snapshot-db`)
     .withInstance({
       applyImmediately: true,
     })