diff --git a/.dev/docker-compose.yaml b/.dev/docker-compose.yaml
index 7c41d0e69..73613ea2e 100644
--- a/.dev/docker-compose.yaml
+++ b/.dev/docker-compose.yaml
@@ -1,6 +1,18 @@
 version: '2'
 
 services:
+
+  db:
+    image: postgres
+    restart: always
+    ports:
+      - 5432:5432
+    environment:
+      POSTGRES_USER: redaction
+      POSTGRES_PASSWORD: redaction
+      POSTGRES_DB: redaction
+
+
   rabbitmq:
     image: 'bitnami/rabbitmq:latest'
     mem_limit: 1000m
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/Comment.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/Comment.java
index 2d5de7dd4..349999546 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/Comment.java
+++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/Comment.java
@@ -31,7 +31,7 @@ public class Comment {
     private OffsetDateTime date;
     @Column
     private String text;
-    @Column
+    @Column(name = "user_id")
     private String user;
 
     @Column
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/IdRemoval.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/IdRemoval.java
index 50127ceab..b5e2dcd0d 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/IdRemoval.java
+++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/IdRemoval.java
@@ -19,7 +19,7 @@ public class IdRemoval {
 
     @EmbeddedId
     private AnnotationId id;
-    @Column
+    @Column(name = "user_id")
     private String user;
     @Column
     private AnnotationStatus status;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualForceRedaction.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualForceRedaction.java
index 12705f179..560105f9d 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualForceRedaction.java
+++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualForceRedaction.java
@@ -19,7 +19,7 @@ public class ManualForceRedaction {
 
     @EmbeddedId
     private AnnotationId id;
-    @Column
+    @Column(name = "user_id")
     private String user;
     @Column
     private AnnotationStatus status;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualImageRecategorization.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualImageRecategorization.java
index e4df796f8..0232e4989 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualImageRecategorization.java
+++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualImageRecategorization.java
@@ -19,7 +19,7 @@ public class ManualImageRecategorization {
 
     @EmbeddedId
     private AnnotationId id;
-    @Column
+    @Column(name = "user_id")
     private String user;
     @Column
     private AnnotationStatus status;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualLegalBasisChange.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualLegalBasisChange.java
index 19d6ed5c7..4cdc88607 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualLegalBasisChange.java
+++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualLegalBasisChange.java
@@ -20,7 +20,7 @@ public class ManualLegalBasisChange {
     @EmbeddedId
     private AnnotationId id;
 
-    @Column
+    @Column(name = "user_id")
     private String user;
     @Column
     private AnnotationStatus status;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualRedactionEntry.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualRedactionEntry.java
index 22c7acc9b..d4cb77d8e 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualRedactionEntry.java
+++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ManualRedactionEntry.java
@@ -15,7 +15,7 @@ public class ManualRedactionEntry {
 
     @EmbeddedId
     private AnnotationId id;
-    @Column
+    @Column(name = "user_id")
     private String user;
     @Column
     private String typeId;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ViewedPage.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ViewedPage.java
index 2246413af..47420e46b 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ViewedPage.java
+++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ViewedPage.java
@@ -33,7 +33,7 @@ public class ViewedPage {
         private String fileId;
         @Column
         private int page;
-        @Column
+        @Column(name = "user_id")
         private String userId;
     }
 
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/RuleSet.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/RuleSet.java
index 942a6c457..da2b5862a 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/RuleSet.java
+++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/RuleSet.java
@@ -21,6 +21,6 @@ public class RuleSet {
     private long version;
 
     @Lob
-    @Column(name = "value", columnDefinition="CLOB")
+    @Column(name = "value", columnDefinition="TEXT")
     private String value;
 }
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/SMTPConfiguration.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/SMTPConfiguration.java
index 00d833efa..bc95cb702 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/SMTPConfiguration.java
+++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/SMTPConfiguration.java
@@ -41,7 +41,7 @@ public class SMTPConfiguration {
     // if AUTH is true, following must also be set
     @Column
     private boolean auth;
-    @Column
+    @Column(name="username")
     private String user;
     @Column
     private String password;
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml b/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml
index 883949275..f65e216f8 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml
@@ -5,11 +5,27 @@ redaction-service.url: "http://redaction-service-v1:8080"
 configuration-service.url: "http://configuration-service-v1:8080"
 pdftron-redaction-service.url: "http://pdftron-redaction-service-v1:8080"
 redaction-report-service.url: "http://redaction-report-service-v1:8080"
+search-service.url: "http://search-service-v1:8080"
 
 server:
   port: 8080
 
 spring:
+
+  datasource:
+    url: jdbc:postgresql://${PSQL_HOST}:${PSQL_PORT}/${PSQL_DATABASE}
+    jdbcUrl: jdbc:postgresql://${PSQL_HOST}:${PSQL_PORT}/${PSQL_DATABASE}
+    driverClassName: org.postgresql.Driver
+    username: ${PSQL_USERNAME}
+    password: ${PSQL_PASSWORD}
+    platform: org.hibernate.dialect.PostgreSQL95Dialect
+  jpa:
+    database-platform: org.hibernate.dialect.PostgreSQL95Dialect
+    hibernate:
+      ddl-auto: update
+      naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
+      generate-ddl: true
+
   profiles:
     active: kubernetes
   rabbitmq:
@@ -43,21 +59,9 @@ cassandra:
 
 storage:
   signer-type: 'AWSS3V4SignerType'
+#  region: 'us-east-1'
+#  endpoint: 'https://s3.amazonaws.com'
   bucket-name: 'redaction'
-  region: 'us-east-1'
-  endpoint: 'https://s3.amazonaws.com'
-
-spring:
-  datasource:
-    jdbcUrl: "jdbc:postgresql://${PSQL_HOST}:${PSQL_PORT}/${PSQL_DATABASE}"
-    driverClassName: org.postgresql.Driver
-    username: ${PSQL_USERNAME}
-    password: ${PSQL_PASSWORD}
-    platform: org.hibernate.dialect.PostgreSQL95Dialect
-  jpa:
-    database-platform: org.hibernate.dialect.PostgreSQL95Dialect
-    hibernate:
-      ddl-auto: update
-      naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
-      generate-ddl: true
-
+  endpoint: 'http://localhost:9000'
+  key: minioadmin
+  secret: minioadmin