diff --git a/2019.12/apache/bin/wait-for-connection b/2019.12/apache/bin/wait-for-connection
deleted file mode 100755
index c3bf2fc..0000000
--- a/2019.12/apache/bin/wait-for-connection
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/local/bin/php
-<?php
-
-/**
- * This script tries to connect to a database for a given interval
- * Useful in case of installation e.g. to wait for the database to not generate unnecessary errors
- *
- * Usage: php bin/wait-for-connection {HOST} {PORT} [{TIMEOUT}]
- */
-
-$timeout = 60;
-switch ($argc) {
-	case 4:
-		$timeout = (float)$argv[3];
-	case 3:
-		$host = $argv[1];
-		$port = (int)$argv[2];
-		break;
-	default:
-		fwrite(STDERR, 'Usage: '.$argv[0].' host port [timeout]'."\n");
-		exit(2);
-}
-if ($timeout < 0) {
-	fwrite(STDERR, 'Timeout must be greater than zero'."\n");
-	exit(2);
-}
-if ($port < 1) {
-	fwrite(STDERR, 'Port must be an integer greater than zero'."\n");
-	exit(2);
-}
-$socketTimeout = (float)ini_get('default_socket_timeout');
-if ($socketTimeout > $timeout) {
-	$socketTimeout = $timeout;
-}
-$stopTime = time() + $timeout;
-do {
-	$sock = @fsockopen($host, $port, $errno, $errstr, $socketTimeout);
-	if ($sock !== false) {
-		fclose($sock);
-		fwrite(STDOUT, "\n");
-		exit(0);
-	}
-	sleep(1);
-	fwrite(STDOUT, '.');
-} while (time() < $stopTime);
-fwrite(STDOUT, "\n");
-exit(1);
diff --git a/2019.12/apache/cron.sh b/2019.12/apache/cron.sh
index ccb0337..7fe7dd6 100755
--- a/2019.12/apache/cron.sh
+++ b/2019.12/apache/cron.sh
@@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do
 done
 
 echo "Waiting for MySQL $MYSQL_HOST initialization..."
-if /usr/local/bin/wait-for-connection "$MYSQL_HOST" "$MYSQL_PORT" 300; then
+if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
   exec php /var/www/html/bin/daemon.php -f start
 else
   echo "[ERROR] Waited 300 seconds, no response" >&2
diff --git a/2019.12/apache/entrypoint.sh b/2019.12/apache/entrypoint.sh
index baed820..8a9577f 100755
--- a/2019.12/apache/entrypoint.sh
+++ b/2019.12/apache/entrypoint.sh
@@ -117,7 +117,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 
 			if [ "$install" = true ]; then
 				echo "Waiting for MySQL $MYSQL_HOST initialization..."
-				if /usr/local/bin/wait-for-connection "$MYSQL_HOST" "$MYSQL_PORT" 300; then
+				if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
 
 					echo "Starting Friendica installation ..."
 					run_as "php /var/www/html/bin/console.php autoinstall $install_options"
diff --git a/2019.12/fpm-alpine/bin/wait-for-connection b/2019.12/fpm-alpine/bin/wait-for-connection
deleted file mode 100755
index c3bf2fc..0000000
--- a/2019.12/fpm-alpine/bin/wait-for-connection
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/local/bin/php
-<?php
-
-/**
- * This script tries to connect to a database for a given interval
- * Useful in case of installation e.g. to wait for the database to not generate unnecessary errors
- *
- * Usage: php bin/wait-for-connection {HOST} {PORT} [{TIMEOUT}]
- */
-
-$timeout = 60;
-switch ($argc) {
-	case 4:
-		$timeout = (float)$argv[3];
-	case 3:
-		$host = $argv[1];
-		$port = (int)$argv[2];
-		break;
-	default:
-		fwrite(STDERR, 'Usage: '.$argv[0].' host port [timeout]'."\n");
-		exit(2);
-}
-if ($timeout < 0) {
-	fwrite(STDERR, 'Timeout must be greater than zero'."\n");
-	exit(2);
-}
-if ($port < 1) {
-	fwrite(STDERR, 'Port must be an integer greater than zero'."\n");
-	exit(2);
-}
-$socketTimeout = (float)ini_get('default_socket_timeout');
-if ($socketTimeout > $timeout) {
-	$socketTimeout = $timeout;
-}
-$stopTime = time() + $timeout;
-do {
-	$sock = @fsockopen($host, $port, $errno, $errstr, $socketTimeout);
-	if ($sock !== false) {
-		fclose($sock);
-		fwrite(STDOUT, "\n");
-		exit(0);
-	}
-	sleep(1);
-	fwrite(STDOUT, '.');
-} while (time() < $stopTime);
-fwrite(STDOUT, "\n");
-exit(1);
diff --git a/2019.12/fpm-alpine/cron.sh b/2019.12/fpm-alpine/cron.sh
index ccb0337..7fe7dd6 100755
--- a/2019.12/fpm-alpine/cron.sh
+++ b/2019.12/fpm-alpine/cron.sh
@@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do
 done
 
 echo "Waiting for MySQL $MYSQL_HOST initialization..."
-if /usr/local/bin/wait-for-connection "$MYSQL_HOST" "$MYSQL_PORT" 300; then
+if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
   exec php /var/www/html/bin/daemon.php -f start
 else
   echo "[ERROR] Waited 300 seconds, no response" >&2
diff --git a/2019.12/fpm-alpine/entrypoint.sh b/2019.12/fpm-alpine/entrypoint.sh
index baed820..8a9577f 100755
--- a/2019.12/fpm-alpine/entrypoint.sh
+++ b/2019.12/fpm-alpine/entrypoint.sh
@@ -117,7 +117,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 
 			if [ "$install" = true ]; then
 				echo "Waiting for MySQL $MYSQL_HOST initialization..."
-				if /usr/local/bin/wait-for-connection "$MYSQL_HOST" "$MYSQL_PORT" 300; then
+				if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
 
 					echo "Starting Friendica installation ..."
 					run_as "php /var/www/html/bin/console.php autoinstall $install_options"
diff --git a/2019.12/fpm/bin/wait-for-connection b/2019.12/fpm/bin/wait-for-connection
deleted file mode 100755
index c3bf2fc..0000000
--- a/2019.12/fpm/bin/wait-for-connection
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/local/bin/php
-<?php
-
-/**
- * This script tries to connect to a database for a given interval
- * Useful in case of installation e.g. to wait for the database to not generate unnecessary errors
- *
- * Usage: php bin/wait-for-connection {HOST} {PORT} [{TIMEOUT}]
- */
-
-$timeout = 60;
-switch ($argc) {
-	case 4:
-		$timeout = (float)$argv[3];
-	case 3:
-		$host = $argv[1];
-		$port = (int)$argv[2];
-		break;
-	default:
-		fwrite(STDERR, 'Usage: '.$argv[0].' host port [timeout]'."\n");
-		exit(2);
-}
-if ($timeout < 0) {
-	fwrite(STDERR, 'Timeout must be greater than zero'."\n");
-	exit(2);
-}
-if ($port < 1) {
-	fwrite(STDERR, 'Port must be an integer greater than zero'."\n");
-	exit(2);
-}
-$socketTimeout = (float)ini_get('default_socket_timeout');
-if ($socketTimeout > $timeout) {
-	$socketTimeout = $timeout;
-}
-$stopTime = time() + $timeout;
-do {
-	$sock = @fsockopen($host, $port, $errno, $errstr, $socketTimeout);
-	if ($sock !== false) {
-		fclose($sock);
-		fwrite(STDOUT, "\n");
-		exit(0);
-	}
-	sleep(1);
-	fwrite(STDOUT, '.');
-} while (time() < $stopTime);
-fwrite(STDOUT, "\n");
-exit(1);
diff --git a/2019.12/fpm/cron.sh b/2019.12/fpm/cron.sh
index ccb0337..7fe7dd6 100755
--- a/2019.12/fpm/cron.sh
+++ b/2019.12/fpm/cron.sh
@@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do
 done
 
 echo "Waiting for MySQL $MYSQL_HOST initialization..."
-if /usr/local/bin/wait-for-connection "$MYSQL_HOST" "$MYSQL_PORT" 300; then
+if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
   exec php /var/www/html/bin/daemon.php -f start
 else
   echo "[ERROR] Waited 300 seconds, no response" >&2
diff --git a/2019.12/fpm/entrypoint.sh b/2019.12/fpm/entrypoint.sh
index baed820..8a9577f 100755
--- a/2019.12/fpm/entrypoint.sh
+++ b/2019.12/fpm/entrypoint.sh
@@ -117,7 +117,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 
 			if [ "$install" = true ]; then
 				echo "Waiting for MySQL $MYSQL_HOST initialization..."
-				if /usr/local/bin/wait-for-connection "$MYSQL_HOST" "$MYSQL_PORT" 300; then
+				if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
 
 					echo "Starting Friendica installation ..."
 					run_as "php /var/www/html/bin/console.php autoinstall $install_options"
diff --git a/2020.03-dev/apache/bin/wait-for-connection b/2020.03-dev/apache/bin/wait-for-connection
deleted file mode 100755
index c3bf2fc..0000000
--- a/2020.03-dev/apache/bin/wait-for-connection
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/local/bin/php
-<?php
-
-/**
- * This script tries to connect to a database for a given interval
- * Useful in case of installation e.g. to wait for the database to not generate unnecessary errors
- *
- * Usage: php bin/wait-for-connection {HOST} {PORT} [{TIMEOUT}]
- */
-
-$timeout = 60;
-switch ($argc) {
-	case 4:
-		$timeout = (float)$argv[3];
-	case 3:
-		$host = $argv[1];
-		$port = (int)$argv[2];
-		break;
-	default:
-		fwrite(STDERR, 'Usage: '.$argv[0].' host port [timeout]'."\n");
-		exit(2);
-}
-if ($timeout < 0) {
-	fwrite(STDERR, 'Timeout must be greater than zero'."\n");
-	exit(2);
-}
-if ($port < 1) {
-	fwrite(STDERR, 'Port must be an integer greater than zero'."\n");
-	exit(2);
-}
-$socketTimeout = (float)ini_get('default_socket_timeout');
-if ($socketTimeout > $timeout) {
-	$socketTimeout = $timeout;
-}
-$stopTime = time() + $timeout;
-do {
-	$sock = @fsockopen($host, $port, $errno, $errstr, $socketTimeout);
-	if ($sock !== false) {
-		fclose($sock);
-		fwrite(STDOUT, "\n");
-		exit(0);
-	}
-	sleep(1);
-	fwrite(STDOUT, '.');
-} while (time() < $stopTime);
-fwrite(STDOUT, "\n");
-exit(1);
diff --git a/2020.03-dev/apache/cron.sh b/2020.03-dev/apache/cron.sh
index ccb0337..7fe7dd6 100755
--- a/2020.03-dev/apache/cron.sh
+++ b/2020.03-dev/apache/cron.sh
@@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do
 done
 
 echo "Waiting for MySQL $MYSQL_HOST initialization..."
-if /usr/local/bin/wait-for-connection "$MYSQL_HOST" "$MYSQL_PORT" 300; then
+if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
   exec php /var/www/html/bin/daemon.php -f start
 else
   echo "[ERROR] Waited 300 seconds, no response" >&2
diff --git a/2020.03-dev/apache/entrypoint.sh b/2020.03-dev/apache/entrypoint.sh
index baed820..8a9577f 100755
--- a/2020.03-dev/apache/entrypoint.sh
+++ b/2020.03-dev/apache/entrypoint.sh
@@ -117,7 +117,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 
 			if [ "$install" = true ]; then
 				echo "Waiting for MySQL $MYSQL_HOST initialization..."
-				if /usr/local/bin/wait-for-connection "$MYSQL_HOST" "$MYSQL_PORT" 300; then
+				if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
 
 					echo "Starting Friendica installation ..."
 					run_as "php /var/www/html/bin/console.php autoinstall $install_options"
diff --git a/2020.03-dev/fpm-alpine/bin/wait-for-connection b/2020.03-dev/fpm-alpine/bin/wait-for-connection
deleted file mode 100755
index c3bf2fc..0000000
--- a/2020.03-dev/fpm-alpine/bin/wait-for-connection
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/local/bin/php
-<?php
-
-/**
- * This script tries to connect to a database for a given interval
- * Useful in case of installation e.g. to wait for the database to not generate unnecessary errors
- *
- * Usage: php bin/wait-for-connection {HOST} {PORT} [{TIMEOUT}]
- */
-
-$timeout = 60;
-switch ($argc) {
-	case 4:
-		$timeout = (float)$argv[3];
-	case 3:
-		$host = $argv[1];
-		$port = (int)$argv[2];
-		break;
-	default:
-		fwrite(STDERR, 'Usage: '.$argv[0].' host port [timeout]'."\n");
-		exit(2);
-}
-if ($timeout < 0) {
-	fwrite(STDERR, 'Timeout must be greater than zero'."\n");
-	exit(2);
-}
-if ($port < 1) {
-	fwrite(STDERR, 'Port must be an integer greater than zero'."\n");
-	exit(2);
-}
-$socketTimeout = (float)ini_get('default_socket_timeout');
-if ($socketTimeout > $timeout) {
-	$socketTimeout = $timeout;
-}
-$stopTime = time() + $timeout;
-do {
-	$sock = @fsockopen($host, $port, $errno, $errstr, $socketTimeout);
-	if ($sock !== false) {
-		fclose($sock);
-		fwrite(STDOUT, "\n");
-		exit(0);
-	}
-	sleep(1);
-	fwrite(STDOUT, '.');
-} while (time() < $stopTime);
-fwrite(STDOUT, "\n");
-exit(1);
diff --git a/2020.03-dev/fpm-alpine/cron.sh b/2020.03-dev/fpm-alpine/cron.sh
index ccb0337..7fe7dd6 100755
--- a/2020.03-dev/fpm-alpine/cron.sh
+++ b/2020.03-dev/fpm-alpine/cron.sh
@@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do
 done
 
 echo "Waiting for MySQL $MYSQL_HOST initialization..."
-if /usr/local/bin/wait-for-connection "$MYSQL_HOST" "$MYSQL_PORT" 300; then
+if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
   exec php /var/www/html/bin/daemon.php -f start
 else
   echo "[ERROR] Waited 300 seconds, no response" >&2
diff --git a/2020.03-dev/fpm-alpine/entrypoint.sh b/2020.03-dev/fpm-alpine/entrypoint.sh
index baed820..8a9577f 100755
--- a/2020.03-dev/fpm-alpine/entrypoint.sh
+++ b/2020.03-dev/fpm-alpine/entrypoint.sh
@@ -117,7 +117,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 
 			if [ "$install" = true ]; then
 				echo "Waiting for MySQL $MYSQL_HOST initialization..."
-				if /usr/local/bin/wait-for-connection "$MYSQL_HOST" "$MYSQL_PORT" 300; then
+				if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
 
 					echo "Starting Friendica installation ..."
 					run_as "php /var/www/html/bin/console.php autoinstall $install_options"
diff --git a/2020.03-dev/fpm/bin/wait-for-connection b/2020.03-dev/fpm/bin/wait-for-connection
deleted file mode 100755
index c3bf2fc..0000000
--- a/2020.03-dev/fpm/bin/wait-for-connection
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/local/bin/php
-<?php
-
-/**
- * This script tries to connect to a database for a given interval
- * Useful in case of installation e.g. to wait for the database to not generate unnecessary errors
- *
- * Usage: php bin/wait-for-connection {HOST} {PORT} [{TIMEOUT}]
- */
-
-$timeout = 60;
-switch ($argc) {
-	case 4:
-		$timeout = (float)$argv[3];
-	case 3:
-		$host = $argv[1];
-		$port = (int)$argv[2];
-		break;
-	default:
-		fwrite(STDERR, 'Usage: '.$argv[0].' host port [timeout]'."\n");
-		exit(2);
-}
-if ($timeout < 0) {
-	fwrite(STDERR, 'Timeout must be greater than zero'."\n");
-	exit(2);
-}
-if ($port < 1) {
-	fwrite(STDERR, 'Port must be an integer greater than zero'."\n");
-	exit(2);
-}
-$socketTimeout = (float)ini_get('default_socket_timeout');
-if ($socketTimeout > $timeout) {
-	$socketTimeout = $timeout;
-}
-$stopTime = time() + $timeout;
-do {
-	$sock = @fsockopen($host, $port, $errno, $errstr, $socketTimeout);
-	if ($sock !== false) {
-		fclose($sock);
-		fwrite(STDOUT, "\n");
-		exit(0);
-	}
-	sleep(1);
-	fwrite(STDOUT, '.');
-} while (time() < $stopTime);
-fwrite(STDOUT, "\n");
-exit(1);
diff --git a/2020.03-dev/fpm/cron.sh b/2020.03-dev/fpm/cron.sh
index ccb0337..7fe7dd6 100755
--- a/2020.03-dev/fpm/cron.sh
+++ b/2020.03-dev/fpm/cron.sh
@@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do
 done
 
 echo "Waiting for MySQL $MYSQL_HOST initialization..."
-if /usr/local/bin/wait-for-connection "$MYSQL_HOST" "$MYSQL_PORT" 300; then
+if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
   exec php /var/www/html/bin/daemon.php -f start
 else
   echo "[ERROR] Waited 300 seconds, no response" >&2
diff --git a/2020.03-dev/fpm/entrypoint.sh b/2020.03-dev/fpm/entrypoint.sh
index baed820..8a9577f 100755
--- a/2020.03-dev/fpm/entrypoint.sh
+++ b/2020.03-dev/fpm/entrypoint.sh
@@ -117,7 +117,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 
 			if [ "$install" = true ]; then
 				echo "Waiting for MySQL $MYSQL_HOST initialization..."
-				if /usr/local/bin/wait-for-connection "$MYSQL_HOST" "$MYSQL_PORT" 300; then
+				if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
 
 					echo "Starting Friendica installation ..."
 					run_as "php /var/www/html/bin/console.php autoinstall $install_options"
diff --git a/docker-cron.sh b/docker-cron.sh
index 36826d9..7fe7dd6 100755
--- a/docker-cron.sh
+++ b/docker-cron.sh
@@ -6,7 +6,7 @@ while [ ! -f /var/www/html/bin/daemon.php ]; do
 done
 
 echo "Waiting for MySQL $MYSQL_HOST initialization..."
-if /var/www/html/bin//wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
+if /var/www/html/bin/wait-for-connection "$MYSQL_HOST" "${MYSQL_PORT:-3306}" 300; then
   exec php /var/www/html/bin/daemon.php -f start
 else
   echo "[ERROR] Waited 300 seconds, no response" >&2
diff --git a/update.sh b/update.sh
index c401cf3..f11632d 100755
--- a/update.sh
+++ b/update.sh
@@ -135,7 +135,6 @@ function create_variant() {
 	cp upgrade.exclude "$dir/"
 
 	cp -rT .config "$dir/config"
-	cp -rT .bin "$dir/bin"
 
     travisEnvAmd64='\n    - env: VERSION='"$dockerName"' VARIANT='"$variant"' ARCH=amd64'"$travisEnvAmd64"
 	for arch in i386 amd64; do