diff --git a/backup.sh b/backup.sh
deleted file mode 100755
index a413f71..0000000
--- a/backup.sh
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/bash
-
-
-# get script dir path
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-# backup directory
-backupDir="${SCRIPT_DIR}/backup"
-
-# current date
-currentDate=$(date +"%Y-%m-%d_%H-%M-%S")
-
-# check for first parameter
-if [[ ! ${1} =~ (backup|restore) ]]; then
-	echo "First parameter needs to be 'backup' or 'restore'"
-	exit 1
-fi
-
-if [[ ${1} == "backup" && ! ${2} =~ (db|repos|confs|gist|data|sshkeys|all) ]]; then
-	echo "Second parameter needs to be 'db', 'repos', 'confs', 'gist', 'data', 'sshkeys' or 'all'"
-	exit 1
-fi
-
-if [[ ${1} == "restore" && ! ${2} =~ (sshkeys|all) ]]; then
-	echo "Second parameter needs to be 'sshkeys'"
-	exit 1
-fi
-
-
-# create backup directories
-mkdir -p ${backupDir}
-mkdir -p ${backupDir}/db
-mkdir -p ${backupDir}/conf
-mkdir -p ${backupDir}/repositories
-if [ -d "data/data" ]; then
-	mkdir -p ${backupDir}/data
-fi
-if [ -d "data/gist" ]; then
-	mkdir -p ${backupDir}/gist
-fi
-
-
-# get compose project name to backup data from correct container
-source ${SCRIPT_DIR}/gitbucket.conf
-CMPS_PRJ=$(echo $COMPOSE_PROJECT_NAME | tr -cd "[A-Za-z-_]")
-
-
-function backup() {
-	echo "backup files from ${CMPS_PRJ} project"
-
-	IDmain=$(docker ps -qf name=${CMPS_PRJ}_main-gitbucket)
-	IDdb=$(docker ps -qf name=${CMPS_PRJ}_mysql-gitbucket)
-
-	while (( "$#" )); do
-	case "$1" in
-	db|all)
-
-		echo "backup database"
-		dbFile="${backupDir}/db/${currentDate}.sql"
-		docker exec $IDdb sh -c 'exec mysqldump --lock-tables --default-character-set=utf8mb4 -uroot -p"${MYSQL_ROOT_PASSWORD}" ${MYSQL_DATABASE}' > ${dbFile}
-		sed -i "/^mysqldump: \\[Warning\\]/d" ${dbFile}
-		tar -cj ${dbFile} -f "${dbFile}.tbz2"
-		rm ${dbFile}
-
-	;;&
-	repos|all)
-
-		echo "backup repositories"
-		dstFile="${backupDir}/repositories/${currentDate}.tbz2"
-		#tar -cj data/repositories -f ${repoFile}
-		tar -I pbzip2 -c data/repositories -f ${dstFile}
-
-		# copy auto backup folder
-		if [ -d "data/backup" ]; then
-			cp -R data/backup "${backupDir}/autoBackup"
-		fi
-
-	;;&
-	confs|all)
-
-		echo "backup config files"
-		tar -cj data/conf gitbucket.conf -f "${backupDir}/conf/${currentDate}.tbz2"
-
-	;;&
-	gist|all)
-	
-		if [ -d "data/gist" ]; then
-			echo "backup gist directory"
-			dstFile="${backupDir}/gist/${currentDate}.tbz2"
-			tar -cj data/gist -f ${dstFile}
-		fi
-
-	;;&
-	data|all)
-
-		if [ -d "data/data" ]; then
-			echo "backup data directory"
-			dstFile="${backupDir}/data/${currentDate}.tbz2"
-			tar -cj data/data -f ${dstFile}
-		fi
-
-	;;&
-	sshkeys|all)
-
-		echo "try to backup ssh keys if available"
-		docker cp ${IDmain}:/srv/gitbucket/gitbucket.ser "${backupDir}/gitbucket.ser" 2> /dev/null
-
-	;;
-	esac
-	shift
-	done
-
-	# delete all files older 30 days
-	find ${backupDir} -iname "*.tbz2" -type f -mtime +30 -exec rm -i {} \; > /dev/null
-}
-
-function restore() {
-	echo "restore files from ${CMPS_PRJ} project"
-
-	while (( "$#" )); do
-	case "$1" in
-	sshkeys|all)
-
-	if [ ! -f "${backupDir}/gitbucket.ser" ]; then
-		echo "${backupDir}/gitbucket.ser does not exist"
-		exit 1
-	fi
-
-	IDmain=$(docker ps -qf name=${CMPS_PRJ}_main-gitbucket)
-
-	echo "restore ssh keys"
-	docker cp "${backupDir}/gitbucket.ser" ${IDmain}:/srv/gitbucket/gitbucket.ser
-
-	;;
-	esac
-	shift
-	done
-}
-
-if [[ ${1} == "backup" ]]; then
-	backup ${@,,}
-elif [[ ${1} == "restore" ]]; then
-	restore ${@,,}
-fi
-
diff --git a/backup_and_restore.sh b/backup_and_restore.sh
new file mode 100755
index 0000000..a413f71
--- /dev/null
+++ b/backup_and_restore.sh
@@ -0,0 +1,145 @@
+#!/bin/bash
+
+
+# get script dir path
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+# backup directory
+backupDir="${SCRIPT_DIR}/backup"
+
+# current date
+currentDate=$(date +"%Y-%m-%d_%H-%M-%S")
+
+# check for first parameter
+if [[ ! ${1} =~ (backup|restore) ]]; then
+	echo "First parameter needs to be 'backup' or 'restore'"
+	exit 1
+fi
+
+if [[ ${1} == "backup" && ! ${2} =~ (db|repos|confs|gist|data|sshkeys|all) ]]; then
+	echo "Second parameter needs to be 'db', 'repos', 'confs', 'gist', 'data', 'sshkeys' or 'all'"
+	exit 1
+fi
+
+if [[ ${1} == "restore" && ! ${2} =~ (sshkeys|all) ]]; then
+	echo "Second parameter needs to be 'sshkeys'"
+	exit 1
+fi
+
+
+# create backup directories
+mkdir -p ${backupDir}
+mkdir -p ${backupDir}/db
+mkdir -p ${backupDir}/conf
+mkdir -p ${backupDir}/repositories
+if [ -d "data/data" ]; then
+	mkdir -p ${backupDir}/data
+fi
+if [ -d "data/gist" ]; then
+	mkdir -p ${backupDir}/gist
+fi
+
+
+# get compose project name to backup data from correct container
+source ${SCRIPT_DIR}/gitbucket.conf
+CMPS_PRJ=$(echo $COMPOSE_PROJECT_NAME | tr -cd "[A-Za-z-_]")
+
+
+function backup() {
+	echo "backup files from ${CMPS_PRJ} project"
+
+	IDmain=$(docker ps -qf name=${CMPS_PRJ}_main-gitbucket)
+	IDdb=$(docker ps -qf name=${CMPS_PRJ}_mysql-gitbucket)
+
+	while (( "$#" )); do
+	case "$1" in
+	db|all)
+
+		echo "backup database"
+		dbFile="${backupDir}/db/${currentDate}.sql"
+		docker exec $IDdb sh -c 'exec mysqldump --lock-tables --default-character-set=utf8mb4 -uroot -p"${MYSQL_ROOT_PASSWORD}" ${MYSQL_DATABASE}' > ${dbFile}
+		sed -i "/^mysqldump: \\[Warning\\]/d" ${dbFile}
+		tar -cj ${dbFile} -f "${dbFile}.tbz2"
+		rm ${dbFile}
+
+	;;&
+	repos|all)
+
+		echo "backup repositories"
+		dstFile="${backupDir}/repositories/${currentDate}.tbz2"
+		#tar -cj data/repositories -f ${repoFile}
+		tar -I pbzip2 -c data/repositories -f ${dstFile}
+
+		# copy auto backup folder
+		if [ -d "data/backup" ]; then
+			cp -R data/backup "${backupDir}/autoBackup"
+		fi
+
+	;;&
+	confs|all)
+
+		echo "backup config files"
+		tar -cj data/conf gitbucket.conf -f "${backupDir}/conf/${currentDate}.tbz2"
+
+	;;&
+	gist|all)
+	
+		if [ -d "data/gist" ]; then
+			echo "backup gist directory"
+			dstFile="${backupDir}/gist/${currentDate}.tbz2"
+			tar -cj data/gist -f ${dstFile}
+		fi
+
+	;;&
+	data|all)
+
+		if [ -d "data/data" ]; then
+			echo "backup data directory"
+			dstFile="${backupDir}/data/${currentDate}.tbz2"
+			tar -cj data/data -f ${dstFile}
+		fi
+
+	;;&
+	sshkeys|all)
+
+		echo "try to backup ssh keys if available"
+		docker cp ${IDmain}:/srv/gitbucket/gitbucket.ser "${backupDir}/gitbucket.ser" 2> /dev/null
+
+	;;
+	esac
+	shift
+	done
+
+	# delete all files older 30 days
+	find ${backupDir} -iname "*.tbz2" -type f -mtime +30 -exec rm -i {} \; > /dev/null
+}
+
+function restore() {
+	echo "restore files from ${CMPS_PRJ} project"
+
+	while (( "$#" )); do
+	case "$1" in
+	sshkeys|all)
+
+	if [ ! -f "${backupDir}/gitbucket.ser" ]; then
+		echo "${backupDir}/gitbucket.ser does not exist"
+		exit 1
+	fi
+
+	IDmain=$(docker ps -qf name=${CMPS_PRJ}_main-gitbucket)
+
+	echo "restore ssh keys"
+	docker cp "${backupDir}/gitbucket.ser" ${IDmain}:/srv/gitbucket/gitbucket.ser
+
+	;;
+	esac
+	shift
+	done
+}
+
+if [[ ${1} == "backup" ]]; then
+	backup ${@,,}
+elif [[ ${1} == "restore" ]]; then
+	restore ${@,,}
+fi
+