diff --git a/.github/tests/default.sh b/.github/tests/default.sh
index 7ba2a73c..d6eaebf7 100755
--- a/.github/tests/default.sh
+++ b/.github/tests/default.sh
@@ -51,3 +51,17 @@ print_heading "Check if zammad-backup created a database backup"
 # Check that the db dump actually has content in the .gz file to catch cases where pg_dump fails.
 docker compose exec zammad-backup sh -c "find /var/tmp/zammad/ -name \"*zammad_db.psql.gz\" -size +1k | grep ."
 print_heading "Database backup successful :)"
+
+print_heading "Stop the stack"
+docker compose down -t0
+
+print_heading "Copy backup files to restore folder"
+docker compose run --rm zammad-backup sh -c "mkdir /var/tmp/zammad/restore && cp /var/tmp/zammad/*gz /var/tmp/zammad/restore/"
+
+print_heading "Start the stack again"
+docker compose up -d
+check_stack_start
+
+print_heading "Check that restore folder was renamed after successful restore..."
+docker compose exec zammad-backup sh -c "[ ! -d /var/tmp/zammad/restore ]"
+print_heading "Restore folder was renamed after successful restore..."
\ No newline at end of file
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 0368fe52..35ffb1e6 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -61,6 +61,10 @@ jobs:
 
       - name: Set up test environment
         run: .github/tests/setup/${{ matrix.module }}.sh
+        env:
+          VERSION: 'develop' # TODO: revert before merging!
 
       - name: Run tests
         run: .github/tests/${{ matrix.module }}.sh
+        env:
+          VERSION: 'develop' # TODO: revert before merging!
diff --git a/docker-compose.yml b/docker-compose.yml
index 6b3f1496..198fc069 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -55,6 +55,7 @@ x-shared:
     image: ${IMAGE_REPO:-ghcr.io/zammad/zammad}:${VERSION:-6.5.0-75}
     restart: ${RESTART:-always}
     volumes:
+      - zammad-backup:/var/tmp/zammad:ro  # needed for waiting on restore operations
       - zammad-storage:/opt/zammad/storage
     depends_on:
       - zammad-memcached
@@ -67,7 +68,7 @@ services:
     command: ["zammad-backup"]
     volumes:
       - zammad-backup:/var/tmp/zammad
-      - zammad-storage:/opt/zammad/storage:ro
+      - zammad-storage:/opt/zammad/storage
     user: 0:0
 
   zammad-elasticsearch: