diff --git a/{{cookiecutter.author}}.{{cookiecutter.role_name}}/.drone.jsonnet b/{{cookiecutter.author}}.{{cookiecutter.role_name}}/.drone.jsonnet
index 5425bda..55376ac 100644
--- a/{{cookiecutter.author}}.{{cookiecutter.role_name}}/.drone.jsonnet
+++ b/{{cookiecutter.author}}.{{cookiecutter.role_name}}/.drone.jsonnet
@@ -8,7 +8,7 @@ local PipelineLinting = {
   steps: [
     {
       name: 'ansible-later',
-      image: 'xoxys/ansible-later:latest',
+      image: 'xoxys/ansible-later',
       commands: [
         'ansible-later',
       ],
@@ -31,15 +31,14 @@ local PipelineDeployment(scenario='{{ cookiecutter.molecule_scenario | replace("
   },
   workspace: {
     base: '/drone/src',
-    path: '{{ cookiecutter.author }}.{{ cookiecutter.role_name }}',
+    path: '${DRONE_REPO_NAME}',
   },
   steps: [
     {
       name: 'ansible-molecule',
-      image: 'xoxys/molecule:latest',
+      image: 'xoxys/molecule:3',
       environment: {
         DO_API_KEY: { from_secret: 'do_api_key' },
-        USER: 'root',
         MOLECULE_CUSTOM_MODULES_REPO: 'https://gitea.rknet.org/ansible/custom_modules',
         MOLECULE_CUSTOM_FILTERS_REPO: 'https://gitea.rknet.org/ansible/custom_filters',
       },
@@ -66,7 +65,7 @@ local PipelineDocumentation = {
   steps: [
     {
       name: 'generate',
-      image: 'xoxys/ansible-doctor:latest',
+      image: 'xoxys/ansible-doctor',
       environment: {
         ANSIBLE_DOCTOR_LOG_LEVEL: 'INFO',
         ANSIBLE_DOCTOR_FORCE_OVERWRITE: true,
@@ -78,9 +77,9 @@ local PipelineDocumentation = {
     },
     {
       name: 'publish',
-      image: 'plugins/gh-pages:latest',
+      image: 'plugins/gh-pages',
       settings: {
-        remote_url: 'https://gitea.rknet.org/ansible/{{ cookiecutter.author }}.{{ cookiecutter.role_name }}',
+        remote_url: 'https://gitea.rknet.org/ansible/${DRONE_REPO_NAME}',
         netrc_machine: 'gitea.rknet.org',
         username: { from_secret: 'gitea_username' },
         password: { from_secret: 'gitea_token' },
diff --git a/{{cookiecutter.author}}.{{cookiecutter.role_name}}/meta/main.yml b/{{cookiecutter.author}}.{{cookiecutter.role_name}}/meta/main.yml
index 3f9ced5..5baba3c 100644
--- a/{{cookiecutter.author}}.{{cookiecutter.role_name}}/meta/main.yml
+++ b/{{cookiecutter.author}}.{{cookiecutter.role_name}}/meta/main.yml
@@ -18,4 +18,4 @@ galaxy_info:
       versions:
         - 7
   galaxy_tags:
-dependencies:
+dependencies: []
diff --git a/{{cookiecutter.author}}.{{cookiecutter.role_name}}/molecule/{{cookiecutter.molecule_scenario | replace('-', '')}}/playbook.yml b/{{cookiecutter.author}}.{{cookiecutter.role_name}}/molecule/{{cookiecutter.molecule_scenario | replace('-', '')}}/converge.yml
similarity index 100%
rename from {{cookiecutter.author}}.{{cookiecutter.role_name}}/molecule/{{cookiecutter.molecule_scenario | replace('-', '')}}/playbook.yml
rename to {{cookiecutter.author}}.{{cookiecutter.role_name}}/molecule/{{cookiecutter.molecule_scenario | replace('-', '')}}/converge.yml
diff --git a/{{cookiecutter.author}}.{{cookiecutter.role_name}}/molecule/{{cookiecutter.molecule_scenario | replace('-', '')}}/molecule.yml b/{{cookiecutter.author}}.{{cookiecutter.role_name}}/molecule/{{cookiecutter.molecule_scenario | replace('-', '')}}/molecule.yml
index bda8441..6b4d42f 100644
--- a/{{cookiecutter.author}}.{{cookiecutter.role_name}}/molecule/{{cookiecutter.molecule_scenario | replace('-', '')}}/molecule.yml	
+++ b/{{cookiecutter.author}}.{{cookiecutter.role_name}}/molecule/{{cookiecutter.molecule_scenario | replace('-', '')}}/molecule.yml	
@@ -2,23 +2,15 @@
 dependency:
   name: galaxy
 driver:
-  name: digitalocean
+  name: delegated
 platforms:
-  - name: "{{ cookiecutter.molecule_scenario | replace('-', '') }}-{{ cookiecutter.role_name | replace('_', '-') }}"
+  - name: {{ cookiecutter.molecule_scenario | replace("-", "") }}-{{ cookiecutter.role_name | replace("_", "-") }}
     region_id: fra1
-    image_id: "{{ cookiecutter.molecule_scenario }}-x64"
-    size_id: "{{ cookiecutter.molecule_machine_size }}"
-lint:
-  name: yamllint
-  enabled: False
+    image_id: {{ cookiecutter.molecule_scenario }}-x64
+    size_id: {{ cookiecutter.molecule_machine_size }}
+lint: |
+  flake8 --max-line-length=99
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
-    enabled: False
 verifier:
   name: testinfra
-  lint:
-    name: flake8
-    options:
-      max-line-length: 120