diff --git a/CHANGELOG b/CHANGELOG
index 44931a9..b0e2880 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+* 0.1.1
+	- Create key table only if not exist
 * 0.1.0
 	- Package wrap with setup.py
 	- Fix hex prefix bug in tx serialization
diff --git a/crypto_dev_signer/keystore/postgres.py b/crypto_dev_signer/keystore/postgres.py
index 2e1854f..9adc16b 100644
--- a/crypto_dev_signer/keystore/postgres.py
+++ b/crypto_dev_signer/keystore/postgres.py
@@ -28,13 +28,13 @@ def to_bytes(x):
 class ReferenceKeystore(Keystore):
 
         schema = [
-    """CREATE TABLE ethereum (
+    """CREATE TABLE IF NOT EXISTS ethereum (
         id SERIAL NOT NULL PRIMARY KEY,
         key_ciphertext VARCHAR(256) NOT NULL,
         wallet_address_hex CHAR(40) NOT NULL
         );
 """,
-    """CREATE UNIQUE INDEX ethereum_address_idx ON ethereum ( wallet_address_hex );
+    """CREATE UNIQUE INDEX IF NOT EXISTS ethereum_address_idx ON ethereum ( wallet_address_hex );
 """,
     ]
 
diff --git a/scripts/crypto-dev-daemon b/scripts/crypto-dev-daemon
index 73b3ea7..a8ca9fc 100755
--- a/scripts/crypto-dev-daemon
+++ b/scripts/crypto-dev-daemon
@@ -152,7 +152,7 @@ def init():
     kw = {
             'symmetric_key': secret,
             }
-    db = ReferenceKeystore('cic_signer', **kw)
+    db = ReferenceKeystore(os.environ.get('SIGNER_DATABASE', 'cic_signer'), **kw)
     signer = ReferenceSigner(db)
 
 
diff --git a/setup.py b/setup.py
index e6c2038..5e6ded3 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
         name="crypto-dev-signer",
-        version="0.1.0",
+        version="0.1.1",
         description="A signer and keystore daemon and library for cryptocurrency software development",
         author="Louis Holbrook",
         author_email="dev@holbrook.no",