diff --git a/.gitignore b/.gitignore
index 939cd4d..91bd2b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,4 +32,5 @@ enterprise-license.lic
 docker/v1/config/keymaker-certificate/
 docker/v1/config/keymaker-ui-nginx/neo4j.com.crt
 docker/v1/config/keymaker-ui-nginx/neo4j.com.key
+docker/v1/build
 
diff --git a/admin-api/package.json b/admin-api/package.json
index d973b03..269599c 100644
--- a/admin-api/package.json
+++ b/admin-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "keymaker-admin-api",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "description": "API app for Keymaker",
   "main": "src/index.js",
   "scripts": {
diff --git a/docker/.DS_Store b/docker/.DS_Store
index d7c1265..e1d44a0 100644
Binary files a/docker/.DS_Store and b/docker/.DS_Store differ
diff --git a/docker/v1/.DS_Store b/docker/v1/.DS_Store
index 314e232..4d3d496 100644
Binary files a/docker/v1/.DS_Store and b/docker/v1/.DS_Store differ
diff --git a/docker/v1/config/keymaker-certificate/neo4j.com.crt b/docker/v1/config/keymaker-certificate/neo4j.com.crt
deleted file mode 100644
index 4cf528d..0000000
--- a/docker/v1/config/keymaker-certificate/neo4j.com.crt
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEqTCCA5GgAwIBAgIJALsY4Ol9rMRoMA0GCSqGSIb3DQEBCwUAMIGTMQswCQYD
-VQQGEwJVUzELMAkGA1UECAwCQ0ExEjAQBgNVBAcMCVNhbiBNYXRlbzEOMAwGA1UE
-CgwFTmVvNGoxEjAQBgNVBAsMCVNvbHV0aW9uczEbMBkGA1UEAwwSY2EubmVvNGou
-c29sdXRpb25zMSIwIAYJKoZIhvcNAQkBFhNzb2x1dGlvbnNAbmVvNGouY29tMB4X
-DTIxMDQyNjE1MzA1OVoXDTIzMDczMDE1MzA1OVowgZkxCzAJBgNVBAYTAlVTMQsw
-CQYDVQQIDAJDQTESMBAGA1UEBwwJU2FuIE1hdGVvMQ4wDAYDVQQKDAVOZW80ajES
-MBAGA1UECwwJU29sdXRpb25zMSEwHwYDVQQDDBhrZXltYWtlci5uZW80ai5zb2x1
-dGlvbnMxIjAgBgkqhkiG9w0BCQEWE3NvbHV0aW9uc0BuZW80ai5jb20wggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs4qpVJjPAUQHzZcS1V00p4Jbr9wlq
-ir48axQQ1al1OAPxMvPt4CCJNqpymiaHn39gYRnKALQG26ARXdSw9L7LmkV28KeO
-U8tns1tf7mlgpoN/nIYGCq6uTeKKvKBV3VWfzLEmEo8Ez0b2nivI11Ymh9z4SVeG
-33eM+a28RUCJnAIzTrjRwboT6oYkss8nCuSWd/QxxM19LmIfZGFFAws3WcbjlK0R
-asIdYIJCSix4BhoaMK805AB5osYsS4gUtlTtVISJa09Nicl9xOvg5n3Z499Dwbl8
-mbnI2afkyWAIXaDtuMPFs2YIb1ca/pTHsg1t0cf4vhO47X41HJ+tJ8z9AgMBAAGj
-gfcwgfQwgbIGA1UdIwSBqjCBp6GBmaSBljCBkzELMAkGA1UEBhMCVVMxCzAJBgNV
-BAgMAkNBMRIwEAYDVQQHDAlTYW4gTWF0ZW8xDjAMBgNVBAoMBU5lbzRqMRIwEAYD
-VQQLDAlTb2x1dGlvbnMxGzAZBgNVBAMMEmNhLm5lbzRqLnNvbHV0aW9uczEiMCAG
-CSqGSIb3DQEJARYTc29sdXRpb25zQG5lbzRqLmNvbYIJAPBWnD/iyK5bMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgTwMCUGA1UdEQQeMByCCW5lbzRqLmNvbYIJbG9jYWxo
-b3N0hwR/AAABMA0GCSqGSIb3DQEBCwUAA4IBAQCCCKIugTyPrTSxmcx1rA7Zk6YQ
-yseXgVqV5/i1fyw2/grZWFc2hZeJGVR1CNvh+susBvklfQWF/6rEoCDUqISDJ7Pd
-4035rnABIFna0olywszjIkiNQh8TeWHK+aL329aAOWqVYVysGAT2xhKgqnnvsvrz
-KAkeCiMuz+BuOWYQ+d+E5hYvilbRxyJ2b4yynS/16Q3oJQXCX0BcQtD2T7ZAjOsN
-hUlbIlkhylcRCIVtXNogW4N7TSDqJCT5OrfscMEWI9Ww8RMD6SyA5Z/N894dHdaZ
-8GUVlgSzxkByIPzcx4D2AAm+BRJxyXkUtmRnCcUvG67EoDQlnJwkj7fAOOUZ
------END CERTIFICATE-----
diff --git a/docker/v1/config/keymaker-certificate/neo4j.com.key b/docker/v1/config/keymaker-certificate/neo4j.com.key
deleted file mode 100644
index e1c9a90..0000000
--- a/docker/v1/config/keymaker-certificate/neo4j.com.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEArOKqVSYzwFEB82XEtVdNKeCW6/cJaoq+PGsUENWpdTgD8TLz
-7eAgiTaqcpomh59/YGEZygC0BtugEV3UsPS+y5pFdvCnjlPLZ7NbX+5pYKaDf5yG
-Bgqurk3iirygVd1Vn8yxJhKPBM9G9p4ryNdWJofc+ElXht93jPmtvEVAiZwCM064
-0cG6E+qGJLLPJwrklnf0McTNfS5iH2RhRQMLN1nG45StEWrCHWCCQkoseAYaGjCv
-NOQAeaLGLEuIFLZU7VSEiWtPTYnJfcTr4OZ92ePfQ8G5fJm5yNmn5MlgCF2g7bjD
-xbNmCG9XGv6Ux7INbdHH+L4TuO1+NRyfrSfM/QIDAQABAoIBAQCSnHHoXco7SDdI
-SsBjLFLCtbQnDUsN7/Td1cyhbiATyNoG/LfBvXS6CALJxxHvp4HkoNO265u/yRZY
-Q+Mv4Y2/qedIs1LUrxjqqz5M/yicDvmrCXjavMpgBKqeDtJFnrqTFooQCGMCqCi8
-0Wu+GWb0q/jnEYNJXE7M3ZvI8k2Fo8OVr/Ge1AoZjprX+0P5nBQ6Y3suCKD/ZeQJ
-HPtwZnOr9qyFZ2OPzD1Ycbp0G0fV+qqAOGy4DzFMDxgSgQKLbLr66h48jUB0YPT4
-c+K1FIy8jkrieskVfxsHsxYoZvJ1kKxekmGoWF0rzg+p51fLstt+xagnkIonwBg2
-o8qcwUBdAoGBANZFVCLRBWPTIBZQ/zh5VzRen9jezdJg2QS3brMCMJtNHcntrjo6
-yXVdKok3JBp86AjkQiA8FdqiZ7v9lQ+kzmv0fTVsLaIxc4F+i61B+UzroFqZic+e
-DA1VaunRbebWCpegrFRXfCpSRyX6/Ur+jG8283eZYzCf89w12goVj/0zAoGBAM6O
-B2BCLrWyJFy8b1tYqou2MIeeXDwXLMzsNqTyCw+lyyIqJiOUCfF8Doxz31UvPArU
-4juF+idtwWvMpC3OHHACehCJHcvomyMLQXdKk4JDJaZCVyVPtFJv4EShXK983cHz
-EASScY84uVFmpo+UOkfYQrFt3bSBGP38DdxA8i0PAoGBAISlOJexJBAPNC78h3Lz
-kyulZHlCPNJ/B/omgE4rDeImVEmcbR45JFwWh+2YCC6poo9WlyUTbUgDAArdyfh8
-QxmLqjN3O6zLxkClEVz5mZany4YqxKiVo8phVaVX9BxR5w7E9cnkusYMV2VIwqM5
-f8CdmQ0yFLiWXMW3RLq3bIMHAoGAQevqRrpYlfyIxmANWiXuKDC5RE8yOKtczPoG
-ZpYpGZFcR0cUbP5uPffN3N2ORW2RyBMxMLYNpE/PD0x8iXHieY0Qz/4y2EUgXgrV
-lfDjKwurFGjPz0Sk1DqIZN7q6cb8L04Xqp3iSEdePbB5MBGqmAtZHa9mtpkNFOJA
-ui6wG9kCgYEAsDUyPkedVaPJPLINYnaBFPwm3bB50h7qrIorZSzzlOQ+90/9MF3+
-CGJYFK7Fvk+nxrpNQh/fp+dFmSCbwl2NNHPBx7gHA50U/Q9u8fDtxD/GpP7JSzav
-Nd3lhcDEpcNjIQ82Cm+2/dWVyOQyVZbpEWmSkYikzV7wmC5cEH6hnJQ=
------END RSA PRIVATE KEY-----
diff --git a/docker/v1/config/keymaker-license/license.lic b/docker/v1/config/keymaker-license/license.lic
index 0fb0240..25f37fb 100644
--- a/docker/v1/config/keymaker-license/license.lic
+++ b/docker/v1/config/keymaker-license/license.lic
@@ -1 +1 @@
-==== Keymaker 6.0.0 - Labs ==== Uj3ULminMvjRyPkSqktgIhHSXUPCRZ/jZub2JDM3dNwJfxG5/GxCOupIft+7fWAofuxMitbwImpfY8y2tb/OHWt/ujhXSUuUJx4wp6tQl3oLLtt8m+YWCix6kinN8cODzH8Djx/bO1ZWjfTnEiXqusP3UwCnFUkXa4Nvo7nmTQEUS1U4MNtY+Sfsw2I0LOz9m/jBvYD2xULXP54qTGdFIkJwPUDm2t1L7KxaOXRmZ5EMdZItBb77gjiuQeSqLr7ysLu7fXvS8rHSBmkZdT+x442TaueD7SNRSELLb+mweNe69xS1dSZhwA23h0t511X+7oUJd8at1YN/o4ArQQLPeQ==_$$_jTU4Sspeo9sVpPnUHWzkDdElPG0m0LBfEq1xHybZPcmvH/bAqktK+5TP0oYXKxj6aeUePH/xbdl13ybivFvoAw==
\ No newline at end of file
+==== Keymaker 6.1.0 - Labs ==== pxX9jfzeY+lygN9kdKKHQ2s/b1R6p1qRJ221dSZ9I5va33is8q3s815dx4tj6QwaIgXcjGIjpgmmc9YjxvAJzkTNqoCMKbTMmtKzeZxPdGi1Zdlt7paMkwTEYJV/ZFbW4U0hEu2hSIBuemQTJgzfkp6HXCtU2JzUv7FTTR1XHoxvf3dnhlni+AKUSKmcG5PrvWpgNWL4mx6cRHQXTdi6siz+yd+72qLwfWj59zvEavOpxPSTbr8U8GPLzFQdqgFal690V8AxzsqKngQ5O/9dqk2W/2LoT1mtWDs2zyWeNbEcqbaW7O4ovz7i1fNvKhEhkOYIi5hfuzmJv7TyggPJfQ==_$$_83rIq2aedQMR6DkI6yuPNWJ1xh92C1e/3DBlwbN0rmtWcTPYUYSCRxZ4YYMYDr9PIkJkzUe2wJrrRbHiTZ7OAg==
\ No newline at end of file
diff --git a/docker/v1/docker-compose.yml b/docker/v1/docker-compose.yml
index 5116dc8..0e7e443 100644
--- a/docker/v1/docker-compose.yml
+++ b/docker/v1/docker-compose.yml
@@ -11,9 +11,9 @@ services:
       - ./config/logs:/app/logs
     environment:
       - LICENSE_FILE=/app/license/license.lic
-      - NEO4J_URI=neo4j+s://127a9b64.databases.neo4j.io:7687
+      - NEO4J_URI=neo4j://localhost:7687
       - NEO4J_USERNAME=neo4j
-      - NEO4J_PASSWORD=5YePYymYZzq5Phd39gYnVRPRiVlQL1dgTCAGgNzuoz4
+      - NEO4J_PASSWORD=neo4j
       - NEO4J_DATABASE=neo4j
       - GRAPHQL_LISTEN_PORT=4002
       - ENCRYPTION_KEY=keymakerEncryptionKey
@@ -41,9 +41,9 @@ services:
     environment:
       - LICENSE_FILE=/app/license/license.lic
       - WHITELISTED_ORIGINS_FILE=/app/config/whitelisted-origins.txt
-      - NEO4J_URI=neo4j+s://127a9b64.databases.neo4j.io:7687
+      - NEO4J_URI=neo4j://localhost:7687
       - NEO4J_USERNAME=neo4j
-      - NEO4J_PASSWORD=5YePYymYZzq5Phd39gYnVRPRiVlQL1dgTCAGgNzuoz4
+      - NEO4J_PASSWORD=neo4j
       - NEO4J_DATABASE=neo4j
       - GRAPHQL_LISTEN_PORT=4001
       - ENCRYPTION_KEY=keymakerEncryptionKey
diff --git a/engine-api/package.json b/engine-api/package.json
index 59d98c2..39704b3 100755
--- a/engine-api/package.json
+++ b/engine-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "keymaker-engine-api",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "description": "Engine API for Keymaker",
   "main": "src/index.js",
   "scripts": {
diff --git a/license.lic b/license.lic
index 981d7be..25f37fb 100644
--- a/license.lic
+++ b/license.lic
@@ -1 +1 @@
-==== Keymaker 5.1.0 - Labs ==== topsZO3SbfzPXu7IA1dMLiAiZJyaYK0nB8tG66ICAhv9ASpFRoo4fMS17fTwvfL4aDUNSk0157YQtS9uTzVjgphU49/6ddLSFKebgaWPr7Ss9t+rVP6PgtswigylbE9gvvacCRuDANbIy5FrbZLMNoetNMxw2BjT6SWeSJHFzkoHkr6f/pCuHFvZH3y54rD/jJTT2oq5+iipI3zzqlMGD/iTYZ7UKW0v9CYoKv5gfpcNL/Zfcpu5XwFfM//QL34q6t1i/72j/kKd65BOnvt0vZJwzO8ruNPkRn0LNo7g6Qnuy82yOpWOHQhgA/BUakZaAhf6Ot4TVirdqzVV2pJI9as=_$$_06m4CfftAeQ+ZXpS4TzYmk3CeJ9MK6wQ5F6v6oZYD9g6kV7GqRf5peu4MaG6A/yrp+CvN92IPGbQUaRyzkh2Bw==
\ No newline at end of file
+==== Keymaker 6.1.0 - Labs ==== pxX9jfzeY+lygN9kdKKHQ2s/b1R6p1qRJ221dSZ9I5va33is8q3s815dx4tj6QwaIgXcjGIjpgmmc9YjxvAJzkTNqoCMKbTMmtKzeZxPdGi1Zdlt7paMkwTEYJV/ZFbW4U0hEu2hSIBuemQTJgzfkp6HXCtU2JzUv7FTTR1XHoxvf3dnhlni+AKUSKmcG5PrvWpgNWL4mx6cRHQXTdi6siz+yd+72qLwfWj59zvEavOpxPSTbr8U8GPLzFQdqgFal690V8AxzsqKngQ5O/9dqk2W/2LoT1mtWDs2zyWeNbEcqbaW7O4ovz7i1fNvKhEhkOYIi5hfuzmJv7TyggPJfQ==_$$_83rIq2aedQMR6DkI6yuPNWJ1xh92C1e/3DBlwbN0rmtWcTPYUYSCRxZ4YYMYDr9PIkJkzUe2wJrrRbHiTZ7OAg==
\ No newline at end of file
diff --git a/ui/package.json b/ui/package.json
index b51f5b9..845c439 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "keymaker-ui",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "description": "UI app for Keymaker",
   "scripts": {
     "start": "react-scripts start",
diff --git a/ui/src/version.js b/ui/src/version.js
index be6dbcf..48dd6eb 100644
--- a/ui/src/version.js
+++ b/ui/src/version.js
@@ -1,2 +1,2 @@
 
-export const VERSION = '6.0.0';
\ No newline at end of file
+export const VERSION = '6.1.0';
\ No newline at end of file