diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerDto.java
index d891894782f6ea921da84d21f13c7344174321f3..78435fc540721a6e695ba0346749b2827b913e3e 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerDto.java
@@ -38,20 +38,8 @@ public class ContainerDto {
     @NotBlank
     private String host;
 
-    @NotNull
     private Integer port;
 
-    @NotBlank
-    @JsonProperty("ui_host")
-    private String uiHost;
-
-    @NotNull
-    @JsonProperty("ui_port")
-    private Integer uiPort;
-
-    @JsonProperty("ui_additional_flags")
-    private String uiAdditionalFlags;
-
     @NotBlank
     @JsonProperty("sidecar_host")
     private String sidecarHost;
@@ -60,6 +48,12 @@ public class ContainerDto {
     @JsonProperty("sidecar_port")
     private Integer sidecarPort;
 
+    @JsonProperty("ui_host")
+    private String uiHost;
+
+    @JsonProperty("ui_port")
+    private Integer uiPort;
+
     private ImageBriefDto image;
 
     @NotNull
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/Container.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/Container.java
index 408f635e052481db583401403ee4932ed4b32db1..82b646e3adbb682e1b6629f85afbb6efbeecdcee 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/Container.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/Container.java
@@ -42,19 +42,19 @@ public class Container {
     @Column(nullable = false)
     private String host;
 
-    @Column(nullable = false, columnDefinition = "integer default 3306")
+    @Column
     private Integer port;
 
-    @Column(nullable = false, columnDefinition = "varchar(255) default host")
+    @Column(nullable = false)
     private String sidecarHost;
 
-    @Column(nullable = false, columnDefinition = "integer default 3305")
+    @Column(nullable = false)
     private Integer sidecarPort;
 
-    @Column(columnDefinition = "varchar(255) default host")
+    @Column
     private String uiHost;
 
-    @Column(columnDefinition = "integer default port")
+    @Column
     private Integer uiPort;
 
     @Column