diff --git a/CHANGELOG.md b/CHANGELOG.md
index 329e7e9..100a247 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and [human-readable changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 * Password now use `regex_escape()` filter in templates
 
+## [0.2.5] - 2020-06-02
+### Fixed:
+* AWS credentials are now supplied to the initialising step
+* Cronjob step does not fail if `scheduled` parameter is not set on repo
+* init respects `'config already initialized'` string
+
 ## [0.2.4] - 2020-06-01
 ### Added
 * `aws_default_region` for repos
@@ -62,7 +68,8 @@ and [human-readable changelog](https://keepachangelog.com/en/1.0.0/).
 * initial release
 
 
-[Unreleased]: https://github.com/arillso/ansible.restic/compare/0.2.4...HEAD
+[Unreleased]: https://github.com/arillso/ansible.restic/compare/0.2.5...HEAD
+[0.2.5]: https://github.com/arillso/ansible.restic/compare/0.2.4...0.2.5
 [0.2.4]: https://github.com/arillso/ansible.restic/compare/0.2.3...0.2.4
 [0.2.3]: https://github.com/arillso/ansible.restic/compare/0.2.2...0.2.3
 [0.2.2]: https://github.com/arillso/ansible.restic/compare/0.2.1...0.2.2
diff --git a/tasks/configure.yml b/tasks/configure.yml
index 1b67585..70d37e1 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -4,12 +4,19 @@
   environment:
     RESTIC_REPOSITORY: '{{ item.value.location }}'
     RESTIC_PASSWORD: '{{ item.value.password }}'
+    AWS_ACCESS_KEY_ID: '{{ item.value.aws_access_key | default("") }}'
+    AWS_SECRET_ACCESS_KEY: '{{
+      item.value.aws_secret_access_key
+      | default("")
+    }}'
+    AWS_DEFAULT_REGION: '{{ item.value.aws_default_region | default("") }}'
   no_log: true
   register: restic_init
   changed_when: "'created restic repository' in restic_init.stdout"
   failed_when:
     - restic_init.rc != 0
     - not 'config file already exists' in restic_init.stderr
+    - not 'config already initialized' in restic_init.stderr
   loop: "{{ restic_repos|dict2items }}"
   when:
     - item.value.init is defined
diff --git a/tasks/distribution/Linux.yml b/tasks/distribution/Linux.yml
index fa6f5a3..3356f0f 100644
--- a/tasks/distribution/Linux.yml
+++ b/tasks/distribution/Linux.yml
@@ -45,5 +45,5 @@
   when:
     - restic_create_cron
     - item.name is defined
-    - item.scheduled
+    - item.scheduled | default(false)
   with_items: '{{ restic_backups }}'