diff --git a/.mrconfig b/.mrconfig
index a6dbee0..941a88e 100644
--- a/.mrconfig
+++ b/.mrconfig
@@ -5,5 +5,4 @@ checkout = git clone https://github.com/CAcertOrg/cats cacert-cats
 checkout = git clone git+ssh://git.cacert.org/srv/git/cacert-mgr.git cacert-mgr
 
 [cacert-software]
-#checkout = git clone git+ssh://git.cacert.org/srv/git/cacert-devel.git cacert-software
-checkout = git clone -b run-locally https://github.com/jandd/cacert-devel.git cacert-software
+checkout = git clone git+ssh://git.cacert.org/srv/git/cacert-devel.git cacert-software
diff --git a/README.md b/README.md
index 586ac73..d0a4ac8 100644
--- a/README.md
+++ b/README.md
@@ -55,17 +55,17 @@ Variable | Usage
 
 
 ```shell
-echo "CATCHALL_MAILBOX_PASSWORD=$(openssl rand -base64 18)
+echo "CATCHALL_MAILBOX_PASSWORD='$(openssl rand -base64 18)'
 CLIENT_CERT_EMAIL=user@example.org
-CLIENT_CERT_PASSWORD=$(openssl rand -base64 18)
-CLIENT_CERT_USERNAME="John Doe"
-MYSQL_WEBDB_PASSWORD=$(openssl rand -base64 18)
+CLIENT_CERT_PASSWORD='$(openssl rand -base64 18)'
+CLIENT_CERT_USERNAME='John Doe'
+MYSQL_WEBDB_PASSWORD='$(openssl rand -base64 18)'
 MYSQL_WEBDB_USER=cacert_dev
-MYSQL_CATS_PASSWORD=$(openssl rand -base64 18)
+MYSQL_CATS_PASSWORD='$(openssl rand -base64 18)'
 MYSQL_CATS_USER=cats
-MYSQL_MGR_PASSWORD=$(openssl rand -base64 18)
+MYSQL_MGR_PASSWORD='$(openssl rand -base64 18)'
 MYSQL_MGR_USER=cacert_mgr
-MYSQL_ROOT_PASSWORD=$(openssl rand -base64 18)" > .env
+MYSQL_ROOT_PASSWORD='$(openssl rand -base64 18)'" | sed 's@/@_@g' > .env
 ./setup_test_ca.sh
 docker-compose up
 ```
diff --git a/docker-compose.yml b/docker-compose.yml
index f8df137..67cab0e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -42,7 +42,6 @@ services:
       CRL_DIRECTORY: /srv/certs/crl
       DEFAULT_HOSTNAME: www.cacert.localhost
       SECURE_HOSTNAME: secure.cacert.localhost
-      TVERIFY_HOSTNAME: tverify.cacert.localhost
       INSECURE_PORT: 8080
       SECURE_PORT: 8443
       RETURN_ADDRESS: "returns@cacert.localhost"
@@ -102,7 +101,6 @@ services:
     volumes:
       - certstaging:/srv/certs
       - signersockets:/srv/sockets
-      - webdbincl:/home/cacert/www/includes/
     depends_on:
       - db
       - smtp
@@ -128,5 +126,4 @@ volumes:
   maildir: { }
   certstaging: { }
   signersockets: { }
-  signerdata: { }
-  webdbincl: { }
+  signerdata: { }
\ No newline at end of file
diff --git a/docker/run-signer b/docker/run-signer
index 01848f2..c145ea5 100755
--- a/docker/run-signer
+++ b/docker/run-signer
@@ -23,7 +23,7 @@ if [ ! -f /srv/ca/gpg/gpg_root_0/secring.gpg ]; then cp /srv/testca/gpg/gpg_root
 if [ ! -f /srv/ca/gpg/gpg_root_0/pubring.gpg ]; then cp /srv/testca/gpg/gpg_root_0/pubring.gpg /srv/ca/gpg/gpg_root_0/pubring.gpg; fi
 
 rm -f /srv/sockets/signer
-socat -d -d "PTY,link=${SERIAL_PORT}" UNIX-LISTEN:/srv/sockets/signer 2>&1 &
+socat -d -d PTY,link=/dev/ttyUSB0 UNIX-LISTEN:/srv/sockets/signer 2>&1 &
 sleep 1
 
 cd /srv/CommModule/
diff --git a/docker/run-signer_client b/docker/run-signer_client
index e8fd99c..7c19dae 100755
--- a/docker/run-signer_client
+++ b/docker/run-signer_client
@@ -2,12 +2,10 @@
 
 set -eu
 
-export SERIAL_PORT=/dev/ttyUSB0
-
-socat -d -d "UNIX:/srv/sockets/signer" "PTY,link=${SERIAL_PORT}" 2>&1 &
+socat -d -d UNIX:/srv/sockets/signer PTY,link=/dev/ttyS0 2>&1 &
 sleep 1
 
-echo "<?php mysql_connect(\"${MYSQL_WEBDB_HOSTNAME}\", \"${MYSQL_WEBDB_USER}\", \"${MYSQL_WEBDB_PASSWORD}\");" > "/home/cacert/www/includes/mysql.php"
+export SERIAL_PORT=/dev/ttyS0
 
 cd /srv/CommModule/
 
diff --git a/webdb.Dockerfile b/webdb.Dockerfile
index 0712ed6..fd3ff3d 100644
--- a/webdb.Dockerfile
+++ b/webdb.Dockerfile
@@ -35,7 +35,6 @@ RUN apt-get update \
     php5-recode \
     psmisc \
     wamerican \
-    wget \
     whois \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \