diff --git a/.docker-files/entrypoint.sh b/.docker-files/entrypoint.sh
index 764eaf3..68063d5 100644
--- a/.docker-files/entrypoint.sh
+++ b/.docker-files/entrypoint.sh
@@ -84,9 +84,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 
 	check=false
 	# cloning from git is just possible for develop or Release Candidats
-	if echo "${FRIENDICA_VERSION,,}" | grep -Eq '^.*(\-dev|-rc)'; then
+	if echo "${FRIENDICA_VERSION}" | grep -Eq '^.*(\-dev|-rc|-RC)'; then
 		# just clone & check if it's a new install or upgrade
-		if [ "$installed_version" = "0.0.0.0" ] || [ "$FRIENDICA_UPGRADE" = "true" ]; then
+		if [ "$installed_version" = "0.0.0.0" ] || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
 			clone_develop
 			image_version="$(cat /usr/src/friendica/VERSION)"
 			check=true
diff --git a/2019.01/apache/entrypoint.sh b/2019.01/apache/entrypoint.sh
index 764eaf3..68063d5 100644
--- a/2019.01/apache/entrypoint.sh
+++ b/2019.01/apache/entrypoint.sh
@@ -84,9 +84,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 
 	check=false
 	# cloning from git is just possible for develop or Release Candidats
-	if echo "${FRIENDICA_VERSION,,}" | grep -Eq '^.*(\-dev|-rc)'; then
+	if echo "${FRIENDICA_VERSION}" | grep -Eq '^.*(\-dev|-rc|-RC)'; then
 		# just clone & check if it's a new install or upgrade
-		if [ "$installed_version" = "0.0.0.0" ] || [ "$FRIENDICA_UPGRADE" = "true" ]; then
+		if [ "$installed_version" = "0.0.0.0" ] || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
 			clone_develop
 			image_version="$(cat /usr/src/friendica/VERSION)"
 			check=true
diff --git a/2019.01/fpm-alpine/entrypoint.sh b/2019.01/fpm-alpine/entrypoint.sh
index 764eaf3..68063d5 100644
--- a/2019.01/fpm-alpine/entrypoint.sh
+++ b/2019.01/fpm-alpine/entrypoint.sh
@@ -84,9 +84,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 
 	check=false
 	# cloning from git is just possible for develop or Release Candidats
-	if echo "${FRIENDICA_VERSION,,}" | grep -Eq '^.*(\-dev|-rc)'; then
+	if echo "${FRIENDICA_VERSION}" | grep -Eq '^.*(\-dev|-rc|-RC)'; then
 		# just clone & check if it's a new install or upgrade
-		if [ "$installed_version" = "0.0.0.0" ] || [ "$FRIENDICA_UPGRADE" = "true" ]; then
+		if [ "$installed_version" = "0.0.0.0" ] || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
 			clone_develop
 			image_version="$(cat /usr/src/friendica/VERSION)"
 			check=true
diff --git a/2019.01/fpm/entrypoint.sh b/2019.01/fpm/entrypoint.sh
index 764eaf3..68063d5 100644
--- a/2019.01/fpm/entrypoint.sh
+++ b/2019.01/fpm/entrypoint.sh
@@ -84,9 +84,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 
 	check=false
 	# cloning from git is just possible for develop or Release Candidats
-	if echo "${FRIENDICA_VERSION,,}" | grep -Eq '^.*(\-dev|-rc)'; then
+	if echo "${FRIENDICA_VERSION}" | grep -Eq '^.*(\-dev|-rc|-RC)'; then
 		# just clone & check if it's a new install or upgrade
-		if [ "$installed_version" = "0.0.0.0" ] || [ "$FRIENDICA_UPGRADE" = "true" ]; then
+		if [ "$installed_version" = "0.0.0.0" ] || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
 			clone_develop
 			image_version="$(cat /usr/src/friendica/VERSION)"
 			check=true
diff --git a/2019.03-dev/apache/entrypoint.sh b/2019.03-dev/apache/entrypoint.sh
index 764eaf3..68063d5 100644
--- a/2019.03-dev/apache/entrypoint.sh
+++ b/2019.03-dev/apache/entrypoint.sh
@@ -84,9 +84,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 
 	check=false
 	# cloning from git is just possible for develop or Release Candidats
-	if echo "${FRIENDICA_VERSION,,}" | grep -Eq '^.*(\-dev|-rc)'; then
+	if echo "${FRIENDICA_VERSION}" | grep -Eq '^.*(\-dev|-rc|-RC)'; then
 		# just clone & check if it's a new install or upgrade
-		if [ "$installed_version" = "0.0.0.0" ] || [ "$FRIENDICA_UPGRADE" = "true" ]; then
+		if [ "$installed_version" = "0.0.0.0" ] || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
 			clone_develop
 			image_version="$(cat /usr/src/friendica/VERSION)"
 			check=true
diff --git a/2019.03-dev/fpm-alpine/entrypoint.sh b/2019.03-dev/fpm-alpine/entrypoint.sh
index 764eaf3..68063d5 100644
--- a/2019.03-dev/fpm-alpine/entrypoint.sh
+++ b/2019.03-dev/fpm-alpine/entrypoint.sh
@@ -84,9 +84,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 
 	check=false
 	# cloning from git is just possible for develop or Release Candidats
-	if echo "${FRIENDICA_VERSION,,}" | grep -Eq '^.*(\-dev|-rc)'; then
+	if echo "${FRIENDICA_VERSION}" | grep -Eq '^.*(\-dev|-rc|-RC)'; then
 		# just clone & check if it's a new install or upgrade
-		if [ "$installed_version" = "0.0.0.0" ] || [ "$FRIENDICA_UPGRADE" = "true" ]; then
+		if [ "$installed_version" = "0.0.0.0" ] || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
 			clone_develop
 			image_version="$(cat /usr/src/friendica/VERSION)"
 			check=true
diff --git a/2019.03-dev/fpm/entrypoint.sh b/2019.03-dev/fpm/entrypoint.sh
index 764eaf3..68063d5 100644
--- a/2019.03-dev/fpm/entrypoint.sh
+++ b/2019.03-dev/fpm/entrypoint.sh
@@ -84,9 +84,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 
 	check=false
 	# cloning from git is just possible for develop or Release Candidats
-	if echo "${FRIENDICA_VERSION,,}" | grep -Eq '^.*(\-dev|-rc)'; then
+	if echo "${FRIENDICA_VERSION}" | grep -Eq '^.*(\-dev|-rc|-RC)'; then
 		# just clone & check if it's a new install or upgrade
-		if [ "$installed_version" = "0.0.0.0" ] || [ "$FRIENDICA_UPGRADE" = "true" ]; then
+		if [ "$installed_version" = "0.0.0.0" ] || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
 			clone_develop
 			image_version="$(cat /usr/src/friendica/VERSION)"
 			check=true
diff --git a/2019.03-rc/apache/entrypoint.sh b/2019.03-rc/apache/entrypoint.sh
index 764eaf3..68063d5 100644
--- a/2019.03-rc/apache/entrypoint.sh
+++ b/2019.03-rc/apache/entrypoint.sh
@@ -84,9 +84,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 
 	check=false
 	# cloning from git is just possible for develop or Release Candidats
-	if echo "${FRIENDICA_VERSION,,}" | grep -Eq '^.*(\-dev|-rc)'; then
+	if echo "${FRIENDICA_VERSION}" | grep -Eq '^.*(\-dev|-rc|-RC)'; then
 		# just clone & check if it's a new install or upgrade
-		if [ "$installed_version" = "0.0.0.0" ] || [ "$FRIENDICA_UPGRADE" = "true" ]; then
+		if [ "$installed_version" = "0.0.0.0" ] || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
 			clone_develop
 			image_version="$(cat /usr/src/friendica/VERSION)"
 			check=true
diff --git a/2019.03-rc/fpm-alpine/entrypoint.sh b/2019.03-rc/fpm-alpine/entrypoint.sh
index 764eaf3..68063d5 100644
--- a/2019.03-rc/fpm-alpine/entrypoint.sh
+++ b/2019.03-rc/fpm-alpine/entrypoint.sh
@@ -84,9 +84,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 
 	check=false
 	# cloning from git is just possible for develop or Release Candidats
-	if echo "${FRIENDICA_VERSION,,}" | grep -Eq '^.*(\-dev|-rc)'; then
+	if echo "${FRIENDICA_VERSION}" | grep -Eq '^.*(\-dev|-rc|-RC)'; then
 		# just clone & check if it's a new install or upgrade
-		if [ "$installed_version" = "0.0.0.0" ] || [ "$FRIENDICA_UPGRADE" = "true" ]; then
+		if [ "$installed_version" = "0.0.0.0" ] || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
 			clone_develop
 			image_version="$(cat /usr/src/friendica/VERSION)"
 			check=true
diff --git a/2019.03-rc/fpm/entrypoint.sh b/2019.03-rc/fpm/entrypoint.sh
index 764eaf3..68063d5 100644
--- a/2019.03-rc/fpm/entrypoint.sh
+++ b/2019.03-rc/fpm/entrypoint.sh
@@ -84,9 +84,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 
 	check=false
 	# cloning from git is just possible for develop or Release Candidats
-	if echo "${FRIENDICA_VERSION,,}" | grep -Eq '^.*(\-dev|-rc)'; then
+	if echo "${FRIENDICA_VERSION}" | grep -Eq '^.*(\-dev|-rc|-RC)'; then
 		# just clone & check if it's a new install or upgrade
-		if [ "$installed_version" = "0.0.0.0" ] || [ "$FRIENDICA_UPGRADE" = "true" ]; then
+		if [ "$installed_version" = "0.0.0.0" ] || [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
 			clone_develop
 			image_version="$(cat /usr/src/friendica/VERSION)"
 			check=true