diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/ControllerPollProperties.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/ControllerPollProperties.java
index 694d5c016..7c33301f3 100644
--- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/ControllerPollProperties.java
+++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/ControllerPollProperties.java
@@ -13,8 +13,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 /**
  * Defines the polling time for the controllers in HH:MM:SS notation.
  * 
- *
- *
  */
 
 @ConfigurationProperties(prefix = "hawkbit.controller")
@@ -38,5 +36,4 @@ public class ControllerPollProperties {
     public void setPollingOverdueTime(final String pollingOverdue) {
         this.pollingOverdueTime = pollingOverdue;
     }
-
 }
diff --git a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/TenantMetaData.java b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/TenantMetaData.java
index e86bfe8a4..4e47f856d 100644
--- a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/TenantMetaData.java
+++ b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/TenantMetaData.java
@@ -60,6 +60,12 @@ public class TenantMetaData implements Serializable {
     @Column(name = "tenant", nullable = false, length = 40)
     private String tenant;
 
+    @Column(name = "polling_time", nullable = true, length = 10)
+    private String pollingTime;
+
+    @Column(name = "polling_overdue_time", nullable = true, length = 10)
+    private String pollingOverdueTime;
+
     private String createdBy;
     private String lastModifiedBy;
     private Long createdAt;
@@ -256,4 +262,19 @@ public class TenantMetaData implements Serializable {
         return true;
     }
 
+    public String getPollingTime() {
+        return pollingTime;
+    }
+
+    public void setPollingTime(String pollingTime) {
+        this.pollingTime = pollingTime;
+    }
+
+    public String getPollingOverdueTime() {
+        return pollingOverdueTime;
+    }
+
+    public void setPollingOverdueTime(String pollingOverdueTime) {
+        this.pollingOverdueTime = pollingOverdueTime;
+    }
 }
diff --git a/hawkbit-repository/src/main/resources/db/migration/H2/V1_6_0__update_target_meta_for_polling___H2.sql b/hawkbit-repository/src/main/resources/db/migration/H2/V1_6_0__update_target_meta_for_polling___H2.sql
new file mode 100644
index 000000000..17ec505bf
--- /dev/null
+++ b/hawkbit-repository/src/main/resources/db/migration/H2/V1_6_0__update_target_meta_for_polling___H2.sql
@@ -0,0 +1,2 @@
+ALTER TABLE sp_tenant ADD polling_time varchar(10);
+ALTER TABLE sp_tenant ADD polling_overdue_time varchar(10);
diff --git a/hawkbit-repository/src/main/resources/db/migration/MYSQL/V1_6_0__update_target_meta_for_polling___MYSQL2.sql b/hawkbit-repository/src/main/resources/db/migration/MYSQL/V1_6_0__update_target_meta_for_polling___MYSQL2.sql
new file mode 100644
index 000000000..3f0aadde6
--- /dev/null
+++ b/hawkbit-repository/src/main/resources/db/migration/MYSQL/V1_6_0__update_target_meta_for_polling___MYSQL2.sql
@@ -0,0 +1,3 @@
+ALTER TABLE sp_tenant ADD polling_time varchar(10);
+ALTER TABLE sp_tenant ADD polling_overdue_time varchar(10);
+