diff --git a/Containers/borgbackup/backupscript.sh b/Containers/borgbackup/backupscript.sh
index 469bb2ea..3d40e83a 100644
--- a/Containers/borgbackup/backupscript.sh
+++ b/Containers/borgbackup/backupscript.sh
@@ -83,6 +83,13 @@ if [ "$BORG_MODE" = backup ]; then
         fi
     done
 
+    if [ -f "/nextcloud_aio_volumes/nextcloud_aio_database_dump/export.failed" ]; then
+        echo "Database export failed the last time. Most likely was the export time not high enough."
+        echo "Cannot create a backup now."
+        echo "Please report this to https://github.com/nextcloud/all-in-one/issues. Thanks!"
+        exit 1
+    fi
+
     # Create backup folder
     mkdir -p "$BORG_BACKUP_DIRECTORY"
 
@@ -140,6 +147,9 @@ if [ "$BORG_MODE" = backup ]; then
         exit 1
     fi
 
+    # Remove the update skip file because the backup was successful
+    rm -f "/nextcloud_aio_volumes/nextcloud_aio_nextcloud_data/skip.update"
+
     echo "$CURRENT_DATE,$CURRENT_DATE_READABLE" >> "/nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/backup_archives.list"
     chmod +r "/nextcloud_aio_volumes/nextcloud_aio_mastercontainer/data/backup_archives.list"
 
@@ -187,6 +197,11 @@ if [ "$BORG_MODE" = restore ]; then
     # Inform user
     get_expiration_time
     echo "Restore finished successfully on $END_DATE_READABLE ($DURATION_READABLE)"
+
+    # Add file to Nextcloud container so that it skips any update the next time
+    touch "/nextcloud_aio_volumes/nextcloud_aio_nextcloud_data/skip.update"
+    chmod 777 "/nextcloud_aio_volumes/nextcloud_aio_nextcloud_data/skip.update"
+
     exit 0
 fi
 
diff --git a/Containers/borgbackup/start.sh b/Containers/borgbackup/start.sh
index d6bfe4a6..9d23f26c 100644
--- a/Containers/borgbackup/start.sh
+++ b/Containers/borgbackup/start.sh
@@ -25,6 +25,11 @@ fi
 rm -f "/nextcloud_aio_volumes/nextcloud_aio_database_dump/backup-is-running"
 
 if [ -n "$FAILED" ]; then
+    if [ "$BORG_MODE" = backup ]; then
+        # Add file to Nextcloud container so that it skips any update the next time
+        touch "/nextcloud_aio_volumes/nextcloud_aio_nextcloud_data/skip.update"
+        chmod 777 "/nextcloud_aio_volumes/nextcloud_aio_nextcloud_data/skip.update"
+    fi
     exit 1
 fi
 
diff --git a/Containers/nextcloud/entrypoint.sh b/Containers/nextcloud/entrypoint.sh
index 17c96d23..abcec62c 100644
--- a/Containers/nextcloud/entrypoint.sh
+++ b/Containers/nextcloud/entrypoint.sh
@@ -39,170 +39,172 @@ if [ "$installed_version" != "0.0.0.0" ]; then
     unset ADMIN_PASSWORD
 fi
 
-
-if version_greater "$image_version" "$installed_version"; then
-    # Check if it skips a major version
-    INSTALLED_MAJOR="${installed_version%%.*}"
-    IMAGE_MAJOR="${image_version%%.*}"
-    if [ "$installed_version" != "0.0.0.0" ] && [ "$((IMAGE_MAJOR - INSTALLED_MAJOR))" -gt 1 ]; then
-        set -ex
-        NEXT_MAJOR="$((INSTALLED_MAJOR + 1))"
-        curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/latest-${NEXT_MAJOR}.tar.bz2"
-        curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/latest-${NEXT_MAJOR}.tar.bz2.asc"
-        export GNUPGHOME="$(mktemp -d)"
-        # gpg key from https://nextcloud.com/nextcloud.asc
-        gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A
-        gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2
-        mkdir -p /usr/src/tmp
-        tar -xjf nextcloud.tar.bz2 -C /usr/src/tmp/
-        gpgconf --kill all
-        rm nextcloud.tar.bz2.asc nextcloud.tar.bz2
-        rm -rf "$GNUPGHOME" /usr/src/tmp/nextcloud/updater
-        mkdir -p /usr/src/tmp/nextcloud/data
-        mkdir -p /usr/src/tmp/nextcloud/custom_apps
-        chmod +x /usr/src/tmp/nextcloud/occ
-        cp /usr/src/nextcloud/config/* /usr/src/tmp/nextcloud/config/
-        mv /usr/src/nextcloud /usr/src/temp-nextcloud
-        mv /usr/src/tmp/nextcloud /usr/src/nextcloud
-        rm -r /usr/src/tmp
-        rm -r /usr/src/temp-nextcloud
-        # shellcheck disable=SC2016
-        image_version="$(php -r 'require "/usr/src/nextcloud/version.php"; echo implode(".", $OC_Version);')"
+# Skip any update if Nextcloud was just restored
+if ! [ -f "/mnt/ncdata/skip.update" ]; then
+    if version_greater "$image_version" "$installed_version"; then
+        # Check if it skips a major version
+        INSTALLED_MAJOR="${installed_version%%.*}"
         IMAGE_MAJOR="${image_version%%.*}"
-        set +ex
-    fi
+        if [ "$installed_version" != "0.0.0.0" ] && [ "$((IMAGE_MAJOR - INSTALLED_MAJOR))" -gt 1 ]; then
+            set -ex
+            NEXT_MAJOR="$((INSTALLED_MAJOR + 1))"
+            curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/latest-${NEXT_MAJOR}.tar.bz2"
+            curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/latest-${NEXT_MAJOR}.tar.bz2.asc"
+            export GNUPGHOME="$(mktemp -d)"
+            # gpg key from https://nextcloud.com/nextcloud.asc
+            gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A
+            gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2
+            mkdir -p /usr/src/tmp
+            tar -xjf nextcloud.tar.bz2 -C /usr/src/tmp/
+            gpgconf --kill all
+            rm nextcloud.tar.bz2.asc nextcloud.tar.bz2
+            rm -rf "$GNUPGHOME" /usr/src/tmp/nextcloud/updater
+            mkdir -p /usr/src/tmp/nextcloud/data
+            mkdir -p /usr/src/tmp/nextcloud/custom_apps
+            chmod +x /usr/src/tmp/nextcloud/occ
+            cp /usr/src/nextcloud/config/* /usr/src/tmp/nextcloud/config/
+            mv /usr/src/nextcloud /usr/src/temp-nextcloud
+            mv /usr/src/tmp/nextcloud /usr/src/nextcloud
+            rm -r /usr/src/tmp
+            rm -r /usr/src/temp-nextcloud
+            # shellcheck disable=SC2016
+            image_version="$(php -r 'require "/usr/src/nextcloud/version.php"; echo implode(".", $OC_Version);')"
+            IMAGE_MAJOR="${image_version%%.*}"
+            set +ex
+        fi
 
-    if [ "$installed_version" != "0.0.0.0" ]; then
-        while true; do
-            echo -e "Checking connection to appstore"
-            CURL_STATUS="$(curl -LI "https://apps.nextcloud.com/" -o /dev/null -w '%{http_code}\n' -s)"
-            if [[ "$CURL_STATUS" = "200" ]]
-            then
-                echo "Appstore is reachable"
-                break
-            else
-                echo "Curl didn't produce a 200 status, is appstore reachable?"
+        if [ "$installed_version" != "0.0.0.0" ]; then
+            while true; do
+                echo -e "Checking connection to appstore"
+                CURL_STATUS="$(curl -LI "https://apps.nextcloud.com/" -o /dev/null -w '%{http_code}\n' -s)"
+                if [[ "$CURL_STATUS" = "200" ]]
+                then
+                    echo "Appstore is reachable"
+                    break
+                else
+                    echo "Curl didn't produce a 200 status, is appstore reachable?"
+                fi
+            done
+
+            php /var/www/html/occ maintenance:mode --off
+
+            echo "Getting and backing up the status of apps for later, this might take a while..."
+            php /var/www/html/occ app:list | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before
+
+            if [ "$((IMAGE_MAJOR - INSTALLED_MAJOR))" -eq 1 ]; then
+                php /var/www/html/occ config:system:delete app_install_overwrite
+            fi
+
+            php /var/www/html/occ app:update --all
+        fi
+
+        echo "Initializing nextcloud $image_version ..."
+        rsync -rlD --delete --exclude-from=/upgrade.exclude /usr/src/nextcloud/ /var/www/html/
+
+        for dir in config data custom_apps themes; do
+            if [ ! -d "/var/www/html/$dir" ] || directory_empty "/var/www/html/$dir"; then
+                rsync -rlD --include "/$dir/" --exclude '/*' /usr/src/nextcloud/ /var/www/html/
             fi
         done
+        rsync -rlD --include '/version.php' --exclude '/*' /usr/src/nextcloud/ /var/www/html/
+        echo "Initializing finished"
 
-        php /var/www/html/occ maintenance:mode --off
+        #install
+        if [ "$installed_version" = "0.0.0.0" ]; then
+            echo "New nextcloud instance"
 
-        echo "Getting and backing up the status of apps for later, this might take a while..."
-        php /var/www/html/occ app:list | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before
+            INSTALL_OPTIONS=(-n --admin-user "$ADMIN_USER" --admin-pass "$ADMIN_PASSWORD")
+            if [ -n "${NEXTCLOUD_DATA_DIR}" ]; then
+                INSTALL_OPTIONS+=(--data-dir "$NEXTCLOUD_DATA_DIR")
+            fi
 
-        if [ "$((IMAGE_MAJOR - INSTALLED_MAJOR))" -eq 1 ]; then
-            php /var/www/html/occ config:system:delete app_install_overwrite
+            echo "Installing with PostgreSQL database"
+            INSTALL_OPTIONS+=(--database pgsql --database-name "$POSTGRES_DB" --database-user "$POSTGRES_USER" --database-pass "$POSTGRES_PASSWORD" --database-host "$POSTGRES_HOST")
+
+            echo "starting nextcloud installation"
+            max_retries=10
+            try=0
+            until php /var/www/html/occ maintenance:install "${INSTALL_OPTIONS[@]}" || [ "$try" -gt "$max_retries" ]
+            do
+                echo "retrying install..."
+                try=$((try+1))
+                sleep 10s
+            done
+            if [ "$try" -gt "$max_retries" ]; then
+                echo "installing of nextcloud failed!"
+                exit 1
+            fi
+
+            # unset admin password
+            unset ADMIN_PASSWORD
+
+            # Apply log settings
+            echo "Applying default settings..."
+            mkdir -p /var/www/html/data
+            php /var/www/html/occ config:system:set loglevel --value=2
+            php /var/www/html/occ config:system:set log_type --value=file
+            php /var/www/html/occ config:system:set logfile --value="/var/log/nextcloud/nextcloud.log"
+            php /var/www/html/occ config:system:set log_rotate_size --value="10485760"
+            php /var/www/html/occ app:enable admin_audit
+            php /var/www/html/occ config:app:set admin_audit logfile --value="/var/log/nextcloud/audit.log"
+            php /var/www/html/occ config:system:set log.condition apps 0 --value="admin_audit"
+
+            # Apply preview settings
+            echo "Applying preview settings..."
+            php /var/www/html/occ config:system:set preview_max_x --value="2048"
+            php /var/www/html/occ config:system:set preview_max_y --value="2048"
+            php /var/www/html/occ config:system:set jpeg_quality --value="60"
+            php /var/www/html/occ config:app:set preview jpeg_quality --value="60"
+            php /var/www/html/occ config:system:delete enabledPreviewProviders
+            php /var/www/html/occ config:system:set enabledPreviewProviders 1 --value="OC\\Preview\\Image"
+            php /var/www/html/occ config:system:set enabledPreviewProviders 2 --value="OC\\Preview\\MarkDown"
+            php /var/www/html/occ config:system:set enabledPreviewProviders 3 --value="OC\\Preview\\MP3"
+            php /var/www/html/occ config:system:set enabledPreviewProviders 4 --value="OC\\Preview\\TXT"
+            php /var/www/html/occ config:system:set enabledPreviewProviders 5 --value="OC\\Preview\\OpenDocument"
+            php /var/www/html/occ config:system:set enabledPreviewProviders 6 --value="OC\\Preview\\Movie"
+            php /var/www/html/occ config:system:set enable_previews --value=true --type=boolean
+
+            # Apply other settings
+            echo "Applying other settings..."
+            php /var/www/html/occ config:system:set upgrade.disable-web --type=bool --value=true
+            php /var/www/html/occ config:system:set mail_smtpmode --value="smtp"
+            php /var/www/html/occ config:system:set trashbin_retention_obligation --value="auto, 30"
+            php /var/www/html/occ config:system:set versions_retention_obligation --value="auto, 30"
+            php /var/www/html/occ config:system:set activity_expire_days --value="30"
+            php /var/www/html/occ config:system:set simpleSignUpLink.shown --type=bool --value=false
+            php /var/www/html/occ config:system:set share_folder --value="/Shared"
+            # Not needed anymore with the removal of the updatenotification app:
+            # php /var/www/html/occ config:app:set updatenotification notify_groups --value="[]"
+
+        #upgrade
+        else
+            while [ -n "$(pgrep -f cron.php)" ]
+            do
+                echo "Waiting for Nextclouds cronjob to finish..."
+                sleep 5
+            done
+
+            echo "Upgrading nextcloud from $installed_version to $image_version..."
+            if ! php /var/www/html/occ upgrade || ! php /var/www/html/occ -V; then
+                echo "Upgrade failed. Please restore from backup."
+                exit 1
+            fi
+
+            php /var/www/html/occ app:list | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after
+            echo "The following apps have been disabled:"
+            diff /tmp/list_before /tmp/list_after | grep '<' | cut -d- -f2 | cut -d: -f1
+            rm -f /tmp/list_before /tmp/list_after
+
+            # Apply optimization
+            echo "Doing some optimizations..."
+            php /var/www/html/occ maintenance:repair
+            php /var/www/html/occ db:add-missing-indices
+            php /var/www/html/occ db:add-missing-columns
+            php /var/www/html/occ db:add-missing-primary-keys
+            yes | php /var/www/html/occ db:convert-filecache-bigint
+            php /var/www/html/occ maintenance:mimetype:update-js
+            php /var/www/html/occ maintenance:mimetype:update-db
         fi
-
-        php /var/www/html/occ app:update --all
-    fi
-
-    echo "Initializing nextcloud $image_version ..."
-    rsync -rlD --delete --exclude-from=/upgrade.exclude /usr/src/nextcloud/ /var/www/html/
-
-    for dir in config data custom_apps themes; do
-        if [ ! -d "/var/www/html/$dir" ] || directory_empty "/var/www/html/$dir"; then
-            rsync -rlD --include "/$dir/" --exclude '/*' /usr/src/nextcloud/ /var/www/html/
-        fi
-    done
-    rsync -rlD --include '/version.php' --exclude '/*' /usr/src/nextcloud/ /var/www/html/
-    echo "Initializing finished"
-
-    #install
-    if [ "$installed_version" = "0.0.0.0" ]; then
-        echo "New nextcloud instance"
-
-        INSTALL_OPTIONS=(-n --admin-user "$ADMIN_USER" --admin-pass "$ADMIN_PASSWORD")
-        if [ -n "${NEXTCLOUD_DATA_DIR}" ]; then
-            INSTALL_OPTIONS+=(--data-dir "$NEXTCLOUD_DATA_DIR")
-        fi
-
-        echo "Installing with PostgreSQL database"
-        INSTALL_OPTIONS+=(--database pgsql --database-name "$POSTGRES_DB" --database-user "$POSTGRES_USER" --database-pass "$POSTGRES_PASSWORD" --database-host "$POSTGRES_HOST")
-
-        echo "starting nextcloud installation"
-        max_retries=10
-        try=0
-        until php /var/www/html/occ maintenance:install "${INSTALL_OPTIONS[@]}" || [ "$try" -gt "$max_retries" ]
-        do
-            echo "retrying install..."
-            try=$((try+1))
-            sleep 10s
-        done
-        if [ "$try" -gt "$max_retries" ]; then
-            echo "installing of nextcloud failed!"
-            exit 1
-        fi
-
-        # unset admin password
-        unset ADMIN_PASSWORD
-
-        # Apply log settings
-        echo "Applying default settings..."
-        mkdir -p /var/www/html/data
-        php /var/www/html/occ config:system:set loglevel --value=2
-        php /var/www/html/occ config:system:set log_type --value=file
-        php /var/www/html/occ config:system:set logfile --value="/var/log/nextcloud/nextcloud.log"
-        php /var/www/html/occ config:system:set log_rotate_size --value="10485760"
-        php /var/www/html/occ app:enable admin_audit
-        php /var/www/html/occ config:app:set admin_audit logfile --value="/var/log/nextcloud/audit.log"
-        php /var/www/html/occ config:system:set log.condition apps 0 --value="admin_audit"
-
-        # Apply preview settings
-        echo "Applying preview settings..."
-        php /var/www/html/occ config:system:set preview_max_x --value="2048"
-        php /var/www/html/occ config:system:set preview_max_y --value="2048"
-        php /var/www/html/occ config:system:set jpeg_quality --value="60"
-        php /var/www/html/occ config:app:set preview jpeg_quality --value="60"
-        php /var/www/html/occ config:system:delete enabledPreviewProviders
-        php /var/www/html/occ config:system:set enabledPreviewProviders 1 --value="OC\\Preview\\Image"
-        php /var/www/html/occ config:system:set enabledPreviewProviders 2 --value="OC\\Preview\\MarkDown"
-        php /var/www/html/occ config:system:set enabledPreviewProviders 3 --value="OC\\Preview\\MP3"
-        php /var/www/html/occ config:system:set enabledPreviewProviders 4 --value="OC\\Preview\\TXT"
-        php /var/www/html/occ config:system:set enabledPreviewProviders 5 --value="OC\\Preview\\OpenDocument"
-        php /var/www/html/occ config:system:set enabledPreviewProviders 6 --value="OC\\Preview\\Movie"
-        php /var/www/html/occ config:system:set enable_previews --value=true --type=boolean
-
-        # Apply other settings
-        echo "Applying other settings..."
-        php /var/www/html/occ config:system:set upgrade.disable-web --type=bool --value=true
-        php /var/www/html/occ config:system:set mail_smtpmode --value="smtp"
-        php /var/www/html/occ config:system:set trashbin_retention_obligation --value="auto, 30"
-        php /var/www/html/occ config:system:set versions_retention_obligation --value="auto, 30"
-        php /var/www/html/occ config:system:set activity_expire_days --value="30"
-        php /var/www/html/occ config:system:set simpleSignUpLink.shown --type=bool --value=false
-        php /var/www/html/occ config:system:set share_folder --value="/Shared"
-        # Not needed anymore with the removal of the updatenotification app:
-        # php /var/www/html/occ config:app:set updatenotification notify_groups --value="[]"
-
-    #upgrade
-    else
-        while [ -n "$(pgrep -f cron.php)" ]
-        do
-            echo "Waiting for Nextclouds cronjob to finish..."
-            sleep 5
-        done
-
-        echo "Upgrading nextcloud from $installed_version to $image_version..."
-        if ! php /var/www/html/occ upgrade || ! php /var/www/html/occ -V; then
-            echo "Upgrade failed. Please restore from backup."
-            exit 1
-        fi
-
-        php /var/www/html/occ app:list | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after
-        echo "The following apps have been disabled:"
-        diff /tmp/list_before /tmp/list_after | grep '<' | cut -d- -f2 | cut -d: -f1
-        rm -f /tmp/list_before /tmp/list_after
-
-        # Apply optimization
-        echo "Doing some optimizations..."
-        php /var/www/html/occ maintenance:repair
-        php /var/www/html/occ db:add-missing-indices
-        php /var/www/html/occ db:add-missing-columns
-        php /var/www/html/occ db:add-missing-primary-keys
-        yes | php /var/www/html/occ db:convert-filecache-bigint
-        php /var/www/html/occ maintenance:mimetype:update-js
-        php /var/www/html/occ maintenance:mimetype:update-db
     fi
 fi
 
@@ -260,3 +262,6 @@ SIGNALING_SERVERS="{\"servers\":[{\"server\":\"https://$NC_DOMAIN/standalone-sig
 php /var/www/html/occ config:app:set spreed stun_servers --value="$STUN_SERVERS" --output json
 php /var/www/html/occ config:app:set spreed turn_servers --value="$TURN_SERVERS" --output json
 php /var/www/html/occ config:app:set spreed signaling_servers --value="$SIGNALING_SERVERS" --output json
+
+# Remove the update skip file always
+rm -f /mnt/ncdata/skip.update
diff --git a/Containers/postgresql/start.sh b/Containers/postgresql/start.sh
index 84005e8d..20db843b 100644
--- a/Containers/postgresql/start.sh
+++ b/Containers/postgresql/start.sh
@@ -27,6 +27,13 @@ if ( [ -f "$DATADIR/PG_VERSION" ] && [ "$PG_MAJOR" != "$(cat "$DATADIR/PG_VERSIO
         exit 1
     fi
 
+    # If database export was unsuccessful, skip update 
+    if [ -f "$DUMP_DIR/export.failed" ]; then
+        echo "Database export failed the last time. Most likely was the export time not high enough."
+        echo "Plese report this to https://github.com/nextcloud/all-in-one/issues. Thanks!"
+        exit 1
+    fi
+
     # Inform
     echo "Restoring from database dump."
 
@@ -74,10 +81,12 @@ wait $!
 
 # Continue with shutdown procedure: do database dump, etc.
 rm -f "$DUMP_FILE.temp"
+touch "$DUMP_DIR/export.failed"
 if pg_dump --username "$POSTGRES_USER" "$POSTGRES_DB" > "$DUMP_FILE.temp"; then
     rm -f "$DUMP_FILE"
     mv "$DUMP_FILE.temp" "$DUMP_FILE"
     pg_ctl stop -m fast
+    rm "$DUMP_DIR/export.failed"
     echo 'Database dump successful!'
     exit 0
 else