diff --git a/roles/diy_backup/.yamllint b/roles/diy_backup/.yamllint
new file mode 100644
index 0000000..a87f8ff
--- /dev/null
+++ b/roles/diy_backup/.yamllint
@@ -0,0 +1,12 @@
+extends: default
+
+rules:
+  braces:
+    max-spaces-inside: 1
+    level: error
+  brackets:
+    max-spaces-inside: 1
+    level: error
+  line-length: disable
+  truthy: disable
+  trailing-spaces: false
diff --git a/roles/diy_backup/defaults/main.yml b/roles/diy_backup/defaults/main.yml
index 595ab82..209a7df 100644
--- a/roles/diy_backup/defaults/main.yml
+++ b/roles/diy_backup/defaults/main.yml
@@ -1,3 +1,4 @@
 ---
 
+atl_diy_backup_repo: "https://bitbucket.org/atlassianlabs/atlassian-bitbucket-diy-backup.git"
 atl_diy_backup_dir: "{{ atl_installation_base }}/bitbucket-diy-backup"
diff --git a/roles/diy_backup/molecule/default/playbook.yml b/roles/diy_backup/molecule/default/playbook.yml
index 0413900..d46bce6 100644
--- a/roles/diy_backup/molecule/default/playbook.yml
+++ b/roles/diy_backup/molecule/default/playbook.yml
@@ -15,6 +15,6 @@
     - name: Install git
       package:
         name: git
-    
+
   roles:
     - role: diy_backup
diff --git a/roles/diy_backup/tasks/main.yml b/roles/diy_backup/tasks/main.yml
index dd3254b..8b066ec 100644
--- a/roles/diy_backup/tasks/main.yml
+++ b/roles/diy_backup/tasks/main.yml
@@ -3,5 +3,6 @@
 
 - name: Fetch the DIY backups repository
   git:
-    repo: "https://bitbucket.org/atlassianlabs/atlassian-bitbucket-diy-backup.git"
+    repo: "{{ atl_diy_backup_repo }}"
     dest: "{{ atl_diy_backup_dir }}"
+    version: "master"
diff --git a/roles/product_startup/.yamllint b/roles/product_startup/.yamllint
new file mode 100644
index 0000000..a87f8ff
--- /dev/null
+++ b/roles/product_startup/.yamllint
@@ -0,0 +1,12 @@
+extends: default
+
+rules:
+  braces:
+    max-spaces-inside: 1
+    level: error
+  brackets:
+    max-spaces-inside: 1
+    level: error
+  line-length: disable
+  truthy: disable
+  trailing-spaces: false
diff --git a/roles/product_startup/handlers/main.yml b/roles/product_startup/handlers/main.yml
index f107732..ecf2a75 100644
--- a/roles/product_startup/handlers/main.yml
+++ b/roles/product_startup/handlers/main.yml
@@ -7,6 +7,7 @@
   when: atl_startup_restart
 
 - name: Enable Product
-  command: systemctl enable "{{ atl_systemd_service_name }}"
+  service:
+    name: "{{ atl_systemd_service_name }}"
+    enabled: true
   when: atl_startup_enable
-
diff --git a/roles/product_startup/molecule/default/playbook.yml b/roles/product_startup/molecule/default/playbook.yml
index 9c31c46..ba24ddc 100644
--- a/roles/product_startup/molecule/default/playbook.yml
+++ b/roles/product_startup/molecule/default/playbook.yml
@@ -14,6 +14,6 @@
       file:
         path: '/etc/systemd/system/'
         state: directory
-    
+
   roles:
     - role: product_startup