diff --git a/infrastructure/docker-backup/build.py b/infrastructure/backup/build.py
similarity index 100%
rename from infrastructure/docker-backup/build.py
rename to infrastructure/backup/build.py
diff --git a/infrastructure/docker-backup/image/Dockerfile b/infrastructure/backup/image/Dockerfile
similarity index 59%
rename from infrastructure/docker-backup/image/Dockerfile
rename to infrastructure/backup/image/Dockerfile
index 02f5ca9..87f0f16 100644
--- a/infrastructure/docker-backup/image/Dockerfile
+++ b/infrastructure/backup/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM domaindrivenarchitecture/dda-backup:1.0.6
+FROM domaindrivenarchitecture/dda-backup:1.0.9
 
 # Prepare Entrypoint Script
 ADD resources /tmp
diff --git a/infrastructure/docker-backup/image/resources/backup.sh b/infrastructure/backup/image/resources/backup.sh
similarity index 100%
rename from infrastructure/docker-backup/image/resources/backup.sh
rename to infrastructure/backup/image/resources/backup.sh
diff --git a/infrastructure/docker-backup/image/resources/entrypoint-start-and-wait.sh b/infrastructure/backup/image/resources/entrypoint-start-and-wait.sh
similarity index 100%
rename from infrastructure/docker-backup/image/resources/entrypoint-start-and-wait.sh
rename to infrastructure/backup/image/resources/entrypoint-start-and-wait.sh
diff --git a/infrastructure/docker-backup/image/resources/entrypoint.sh b/infrastructure/backup/image/resources/entrypoint.sh
similarity index 100%
rename from infrastructure/docker-backup/image/resources/entrypoint.sh
rename to infrastructure/backup/image/resources/entrypoint.sh
diff --git a/infrastructure/docker-backup/image/resources/init.sh b/infrastructure/backup/image/resources/init.sh
similarity index 100%
rename from infrastructure/docker-backup/image/resources/init.sh
rename to infrastructure/backup/image/resources/init.sh
diff --git a/infrastructure/docker-backup/image/resources/install.sh b/infrastructure/backup/image/resources/install.sh
similarity index 100%
rename from infrastructure/docker-backup/image/resources/install.sh
rename to infrastructure/backup/image/resources/install.sh
diff --git a/infrastructure/docker-backup/image/resources/restic-snapshots.sh b/infrastructure/backup/image/resources/restic-snapshots.sh
similarity index 100%
rename from infrastructure/docker-backup/image/resources/restic-snapshots.sh
rename to infrastructure/backup/image/resources/restic-snapshots.sh
diff --git a/infrastructure/docker-backup/image/resources/restore.sh b/infrastructure/backup/image/resources/restore.sh
similarity index 100%
rename from infrastructure/docker-backup/image/resources/restore.sh
rename to infrastructure/backup/image/resources/restore.sh
diff --git a/infrastructure/docker-backup/test/Dockerfile b/infrastructure/backup/test/Dockerfile
similarity index 100%
rename from infrastructure/docker-backup/test/Dockerfile
rename to infrastructure/backup/test/Dockerfile
diff --git a/infrastructure/docker-backup/test/serverspec.edn b/infrastructure/backup/test/serverspec.edn
similarity index 100%
rename from infrastructure/docker-backup/test/serverspec.edn
rename to infrastructure/backup/test/serverspec.edn