diff --git a/tools/migration/cfg/migrator_1_8_0/__init__.py b/tools/migration/cfg/migrator_1_8_0/__init__.py
index 1c9336b23..e7d6ab3d3 100644
--- a/tools/migration/cfg/migrator_1_8_0/__init__.py
+++ b/tools/migration/cfg/migrator_1_8_0/__init__.py
@@ -18,6 +18,11 @@ keys = [
     'db_password',
     'db_port',
     'db_user',
+    'clair_db_host',
+    'clair_db_password',
+    'clair_db_port',
+    'clair_db_username',
+    'clair_db',
     'redis_host',
     'redis_port',
     'redis_password',
diff --git a/tools/migration/cfg/migrator_1_8_0/harbor.yml.jinja b/tools/migration/cfg/migrator_1_8_0/harbor.yml.jinja
index e70c3ba06..0d737747b 100644
--- a/tools/migration/cfg/migrator_1_8_0/harbor.yml.jinja
+++ b/tools/migration/cfg/migrator_1_8_0/harbor.yml.jinja
@@ -84,11 +84,34 @@ _version: 1.8.0
 # Uncomment external_database if using external database. And the password will replace the the password setting in database.
 # And currently ontly support postgres.
 external_database:
-  host: {{ db_host }}
-  port: {{ db_port }}
-  username: {{ db_user }}
-  password: {{ db_password }}
-  ssl_mode: disable
+  harbor:
+    host: {{ db_host }}
+    port: {{ db_port }}
+    db_name: registry
+    username: {{ db_user }}
+    password: {{ db_password }}
+    ssl_mode: disable
+  clair:
+    host: {{ clair_db_host }}
+    port: {{ clair_db_port }}
+    db_name: {{ clair_db }}
+    username: {{ clair_db_username }}
+    password: {{ clair_db_password }}
+    ssl_mode: disable
+  notary_signer:
+    host: {{ db_host }}
+    port: {{ db_port }}
+    db_name: notarysigner
+    username: {{ db_user }}
+    password: {{ db_password }}
+    ssl_mode: disable
+  notary_server:
+    host: {{ db_host }}
+    port: {{ db_port }}
+    db_name: notaryserver
+    username: {{ db_user }}
+    password: {{ db_password }}
+    ssl_mode: disable
 {% endif %}
 
 {% if external_redis %}