diff --git a/make/common/templates/notary/mysql-initdb.d/initial-notaryserver.sql b/make/common/templates/notary/mysql-initdb.d/initial-notaryserver.sql
index 0cc1e9b221..ae124ed154 100644
--- a/make/common/templates/notary/mysql-initdb.d/initial-notaryserver.sql
+++ b/make/common/templates/notary/mysql-initdb.d/initial-notaryserver.sql
@@ -1,7 +1,7 @@
 CREATE DATABASE IF NOT EXISTS `notaryserver`;
 
-CREATE USER "server"@"%" IDENTIFIED BY "";
+CREATE USER "server"@"notary-server.%" IDENTIFIED BY "";
 
 GRANT
 	ALL PRIVILEGES ON `notaryserver`.* 
-	TO "server"@"%";
+	TO "server"@"notary-server.%"
diff --git a/make/common/templates/notary/mysql-initdb.d/initial-notarysigner.sql b/make/common/templates/notary/mysql-initdb.d/initial-notarysigner.sql
index 1e985d81c7..a3917d508b 100644
--- a/make/common/templates/notary/mysql-initdb.d/initial-notarysigner.sql
+++ b/make/common/templates/notary/mysql-initdb.d/initial-notarysigner.sql
@@ -1,7 +1,7 @@
 CREATE DATABASE IF NOT EXISTS `notarysigner`;
 
-CREATE USER "signer"@"%" IDENTIFIED BY "";
+CREATE USER "signer"@"notary-signer.%" IDENTIFIED BY "";
 
 GRANT
 	ALL PRIVILEGES ON `notarysigner`.* 
-	TO "signer"@"%";
+	TO "signer"@"notary-signer.%";
diff --git a/make/docker-compose.notary.yml b/make/docker-compose.notary.yml
index a5ccfc0aea..0b63403662 100644
--- a/make/docker-compose.notary.yml
+++ b/make/docker-compose.notary.yml
@@ -47,7 +47,7 @@ services:
         syslog-address: "tcp://127.0.0.1:1514"
         tag: "notary-signer"
   notary-db:
-    image: mariadb:10.1.10
+    image: vmware/harbor-notary-db:mariadb-10.1.10
     container_name: notary-db
     networks:
       notary-mdb: