diff --git a/backups/create_gitea_backup.sh b/backups/create_gitea_backup.sh
deleted file mode 100755
index d91edd6..0000000
--- a/backups/create_gitea_backup.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-# Backup script for Gitea in a Kubernetes cluster
-
-# `gitea dump` is a mess that we should not touch. We write our own backup scripts instead.
-
-BACKUP_DEST='/mnt/PRIVATE_DOCS/BACKUPS/gitea'
-PASSFILE='./gitea_pass.txt'
-
-# Retrieve container names
-base_container="$( docker ps --format '{{.Names}}' | grep 'hugit-gitea_hugit-gitea' )"
-database_container="$( docker ps --format '{{.Names}}' | grep 'hugit-postgresql_hugit-postgresql' )"
-
-# Abort entire script if any command fails
-set -e
-
-# Enable maintenance mode
-# Flush queues
-docker exec "${base_container}" gitea manager flush-queues
-# Pause queues
-# TODO
-
-# Backup the database
->&2 echo 'Backing up database'
-database_backupfile="gitea-sqlbkp_$( date +'%Y%m%d' ).bak"
-internal_database_backupfile="/tmp/${database_backupfile}"
-docker exec --env-file "${PASSFILE}" "${database_container}" pg_dump 'gitea' -cwv -h 'localhost' -U 'gitea' -f "${internal_database_backupfile}"
-docker cp "${database_container}":"${internal_database_backupfile}" "${BACKUP_DEST}"
-
-# Backup files
-tar czvf "${BACKUP_DEST}/gitea-data_$(date +'%Y%m%d').tar.gz" -C "/mnt/APPS/hugit"
-
-# Disable maintenance mode
-# TODO
-
-# Double check
-# gitea doctor --all --log-file /tmp/doctor.log
-# TODO
diff --git a/scripts/gitea/backup-database.sh b/scripts/gitea/backup-database.sh
new file mode 100755
index 0000000..08cd4c4
--- /dev/null
+++ b/scripts/gitea/backup-database.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+# Backup Gitea database in a Kubernetes environment
+# Usage: backup-database [OPTIONS] <destination>
+
+# `gitea dump` is a mess that we should not touch. We write our own backup scripts instead.
+#
+usage() {
+    >&2 printf "Usage: %s <destination>\n" "${0}"
+    >&2 printf "Options:\n"
+    >&2 printf "\t-e \t Specify the environment file to use\n"
+    exit "${1:-1}"
+}
+
+# Get options
+
+while getopts ":e:" option; do
+    case "${option}" in
+        e)
+            if ! [ -f "${OPTARG}" ]; then
+                >&2 printf "Error: Specified environment file does not exist: '%s'.\n" "${OPTARG}"
+            elif ! [ -r "${OPTARG}" ]; then
+                >&2 printf "Error: Specified environment file is not readable: '%s'.\n" "${OPTARG}"
+            fi
+            env_file="${OPTARG}"
+            ;;
+        *)
+            >&2 printf "Error: Invalid option: '%s'.\n" "${option}"
+            usage
+            ;;
+    esac
+done
+shift $(( OPTIND - 1 ))
+
+# Check arguments.
+
+if [ $# -ne 1 ]; then
+    >&2 printf "Error: You need to specify a destination.\n"
+    usage
+elif ! [ -d "${1}" ]; then
+    >&2 printf "Error: Specified destination does not exist or is not readable : '%s'.\n" "${1}"
+    usage
+else
+    destination="${1}"
+fi
+
+# Retrieve container names
+base_container="$( docker ps --format '{{.Names}}' | grep -E 'gitea_gitea-[0-9a-z]{10}-[0-9a-z]{5}' )"
+database_container="$( docker ps --format '{{.Names}}' | grep 'postgres_gitea-cnpg-main-1' )"
+
+if ! [[ -n "${base_container}" && -n "${database_container}" ]]; then
+    >&2 printf "Error: Not all containers could be found.\n"
+    exit 2
+fi
+
+# Abort entire script if any command fails
+set -e
+
+# Enable maintenance mode
+# Flush queues
+docker exec "${base_container}" gitea manager flush-queues
+# TODO Pause queues
+
+# Database backup
+
+# Filename for database backup. 
+database_backupfile="gitea-sqlbkp_$( date +'%Y%m%d' ).bak"
+host_database_backupfile="${destination}/${database_backupfile}"
+
+# Backup the database
+>&2 echo 'Backing up database'
+docker exec --env-file "${env_file:=.env}" "${database_container}" pg_dump 'gitea' -cwv -h 'localhost' -U 'gitea' > "${host_database_backupfile}"
+
+# Disable maintenance mode
+# TODO Continue queues
+
+# Double check
+# gitea doctor --all --log-file /tmp/doctor.log
+# TODO
+
+printf "Done.\n"