diff --git a/notarymysql/Dockerfile b/notarymysql/Dockerfile
index 6fa0058aea..0810a1c6bd 100644
--- a/notarymysql/Dockerfile
+++ b/notarymysql/Dockerfile
@@ -7,8 +7,9 @@ RUN apt-get update \
  && rm -rf /var/lib/apt/lists/*
 
 ADD start /start
-ADD initial.sql /initial.sql
-ADD migrate.sql /migrate.sql
+ADD initial-notaryserver.sql /initial-notaryserver.sql
+ADD initial-notarysigner.sql /initial-notarysigner.sql
+ADD migrate-notaryserver.sql /migrate-notaryserver.sql
 RUN chmod 755 /start
 
 EXPOSE 3306
diff --git a/notarymysql/initial.sql b/notarymysql/initial-notaryserver.sql
similarity index 50%
rename from notarymysql/initial.sql
rename to notarymysql/initial-notaryserver.sql
index 36088d46b3..02201a6a47 100644
--- a/notarymysql/initial.sql
+++ b/notarymysql/initial-notaryserver.sql
@@ -18,21 +18,3 @@ CREATE TABLE `timestamp_keys` (
 	`public` blob NOT NULL,
 	PRIMARY KEY (`gun`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-DROP TABLE IF EXISTS `private_keys`;
-CREATE TABLE `private_keys` (
-	`id` int(11) NOT NULL AUTO_INCREMENT,
-	`created_at` timestamp NULL DEFAULT NULL,
-	`updated_at` timestamp NULL DEFAULT NULL,
-	`deleted_at` timestamp NULL DEFAULT NULL,
-	`key_id`  varchar(255) NOT NULL,
-	`encryption_alg`  varchar(255) NOT NULL,
-	`keywrap_alg`  varchar(255) NOT NULL,
-	`algorithm`  varchar(50) NOT NULL,
-	`passphrase_alias`  varchar(50) NOT NULL,
-	`public`  blob NOT NULL,
-	`private`  blob NOT NULL,
-	PRIMARY KEY (`id`),
-	UNIQUE (`key_id`),
-	UNIQUE (`key_id`,`algorithm`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/notarymysql/initial-notarysigner.sql b/notarymysql/initial-notarysigner.sql
new file mode 100644
index 0000000000..5eac3a9f7c
--- /dev/null
+++ b/notarymysql/initial-notarysigner.sql
@@ -0,0 +1,17 @@
+DROP TABLE IF EXISTS `private_keys`;
+CREATE TABLE `private_keys` (
+	`id` int(11) NOT NULL AUTO_INCREMENT,
+	`created_at` timestamp NULL DEFAULT NULL,
+	`updated_at` timestamp NULL DEFAULT NULL,
+	`deleted_at` timestamp NULL DEFAULT NULL,
+	`key_id`  varchar(255) NOT NULL,
+	`encryption_alg`  varchar(255) NOT NULL,
+	`keywrap_alg`  varchar(255) NOT NULL,
+	`algorithm`  varchar(50) NOT NULL,
+	`passphrase_alias`  varchar(50) NOT NULL,
+	`public`  blob NOT NULL,
+	`private`  blob NOT NULL,
+	PRIMARY KEY (`id`),
+	UNIQUE (`key_id`),
+	UNIQUE (`key_id`,`algorithm`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/notarymysql/migrate.sql b/notarymysql/migrate-notaryserver.sql
similarity index 91%
rename from notarymysql/migrate.sql
rename to notarymysql/migrate-notaryserver.sql
index 2cebc20ac6..eeece0b55c 100644
--- a/notarymysql/migrate.sql
+++ b/notarymysql/migrate-notaryserver.sql
@@ -1,4 +1,4 @@
--- This migrates initial.sql to tables that are needed for GORM
+-- This migrates initial-notaryserver.sql to tables that are needed for GORM
 
 ALTER TABLE `tuf_files`
 ADD COLUMN `created_at` timestamp NULL DEFAULT NULL AFTER `id`,
diff --git a/notarymysql/start b/notarymysql/start
index d086507495..dda816de79 100755
--- a/notarymysql/start
+++ b/notarymysql/start
@@ -141,15 +141,17 @@ if [ -n "${DB_USER}" -o -n "${DB_NAME}" ]; then
             echo "Granting access to database \"$db\" for user \"${DB_USER_SERVER}\"..."
             mysql --defaults-file=/etc/mysql/debian.cnf \
             -e "GRANT ALL PRIVILEGES ON \`$db\`.* TO '${DB_USER_SERVER}' IDENTIFIED BY '${DB_PASS_SERVER}';"
+            # Create our Database:
+            mysql -uroot $db < ./initial-notaryserver.sql
+            mysql -uroot $db < ./migrate-notaryserver.sql
           fi
           if [ -n "${DB_USER_SIGNER}" -a $db = $DB_NAME_SIGNER ]; then
             echo "Granting access to database \"$db\" for user \"${DB_USER_SIGNER}\"..."
             mysql --defaults-file=/etc/mysql/debian.cnf \
             -e "GRANT ALL PRIVILEGES ON \`$db\`.* TO '${DB_USER_SIGNER}' IDENTIFIED BY '${DB_PASS_SIGNER}';"
+            # Create our Database:
+            mysql -uroot $db < ./initial-notarysigner.sql
           fi
-          # Create our Database:
-          mysql -uroot $db < ./initial.sql
-          mysql -uroot $db < ./migrate.sql
       fi
     done
   fi