diff --git a/.template-lintrc.js b/.template-lintrc.js
index 071cdbc..aaad20d 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -2,20 +2,5 @@
 
 module.exports = {
   extends: 'recommended',
-  rules: {
-    // TODO: Remove over time
-    'link-href-attributes': false,
-    'no-action': false,
-    'no-curly-component-invocation': false,
-    'no-implicit-this': false,
-    'no-inline-styles': false,
-    'no-invalid-interactive': false,
-    'no-link-to-positional-params': false,
-    'no-partial': false,
-    'no-unbalanced-curlies': false,
-    'require-button-type': false,
-    'require-iframe-title': false,
-    'require-input-label': false,
-    'require-valid-alt-text': false,
-  },
+  rules: {},
 };
diff --git a/tests/dummy/app/controllers/projects.js b/tests/dummy/app/controllers/projects.js
index f157a92..7cbde3c 100644
--- a/tests/dummy/app/controllers/projects.js
+++ b/tests/dummy/app/controllers/projects.js
@@ -89,4 +89,9 @@ export default class extends Controller {
       // show a flash message or transitionTo somewehere
     });
   }
+
+  @action
+  setName(event) {
+    this.name = event.target.value;
+  }
 }
diff --git a/tests/dummy/app/controllers/projects/project.js b/tests/dummy/app/controllers/projects/project.js
index 7edc6c3..0e3f6ca 100644
--- a/tests/dummy/app/controllers/projects/project.js
+++ b/tests/dummy/app/controllers/projects/project.js
@@ -27,4 +27,9 @@ export default class extends Controller {
   deleteTask(task) {
     task.destroyRecord();
   }
+
+  @action
+  setName(event) {
+    this.name = event.target.value;
+  }
 }
diff --git a/tests/dummy/app/templates/index.hbs b/tests/dummy/app/templates/index.hbs
index c8acb09..69b188f 100644
--- a/tests/dummy/app/templates/index.hbs
+++ b/tests/dummy/app/templates/index.hbs
@@ -3,5 +3,5 @@ The addon provides a <code>storageFor</code> computed property that returns a pr
 It ships with an ember-data adapter that works almost the same as the JSONAPIAdapter with some relationship sugar added.<br><br>
 
 Your Page Visits: {{this.stats.counter}}
-<button {{on "click" this.countUp}}>Count up</button>
-<button {{on "click" this.resetCounter}}>X</button>
+<button type="button" {{on "click" this.countUp}}>Count up</button>
+<button type="button" {{on "click" this.resetCounter}}>X</button>
diff --git a/tests/dummy/app/templates/post.hbs b/tests/dummy/app/templates/post.hbs
deleted file mode 100644
index 5671ac2..0000000
--- a/tests/dummy/app/templates/post.hbs
+++ /dev/null
@@ -1,17 +0,0 @@
-<br>
-{{model.id}}<br>
-{{model.name}}<br>
-{{model.comments.length}}<br>
-
-<button {{action "countUp"}}>Post Visits: {{postStats.counter}}</button>
-
-<button {{action "resetCounter"}}>X</button>
-
-<br>
-{{#each model.comments as |comment|}}
-  {{comment.name}} -
-  <a {{action "deleteComment" comment}} role="button">Delete</a>
-  <br>
-{{/each}}
-<br>
-<a {{action "createComment" model}} role="button">Create comment</a>
\ No newline at end of file
diff --git a/tests/dummy/app/templates/projects.hbs b/tests/dummy/app/templates/projects.hbs
index d23e875..5532ee5 100644
--- a/tests/dummy/app/templates/projects.hbs
+++ b/tests/dummy/app/templates/projects.hbs
@@ -1,17 +1,18 @@
 Open the developer tools and go to <code>Resources</code> -> <code>Local Storage</code> or reload to see the effect.<br><br>
 
-<input
-  type="file"
-  {{on "change" this.importData}}
-/>
-<a {{on "click" this.exportData}} role="button">Export</a>
+<label>
+  <input type="file" {{on "change" this.importData}} />
+</label>
+<button type="button" {{on "click" this.exportData}}>Export</button>
 
 <br>
 <br>
 
-<strong>Name:</strong>
-<input value={{this.name}} oninput={{action (mut this.name) value="target.value"}} />
-<a {{on "click" (fn this.createProject this.name)}} role="button">Create project</a>
+<label>
+  <strong>Name:</strong>
+  <input value={{this.name}} {{on "input" this.setName}} />
+</label>
+<button type="button" {{on "click" (fn this.createProject this.name)}}>Create project</button>
 
 <br>
 <br>
@@ -22,7 +23,7 @@ Open the developer tools and go to <code>Resources</code> -> <code>Local Storage
 
     {{#each this.model as |project|}}
       <LinkTo @route="projects.project" @model={{project}}>{{project.name}}</LinkTo> -
-      <a {{on "click" (fn this.deleteProject project)}} role="button">Delete</a>
+      <button type="button" {{on "click" (fn this.deleteProject project)}}>Delete</button>
       <br>
     {{/each}}
   </div>
diff --git a/tests/dummy/app/templates/projects/project.hbs b/tests/dummy/app/templates/projects/project.hbs
index 57908bd..2764194 100644
--- a/tests/dummy/app/templates/projects/project.hbs
+++ b/tests/dummy/app/templates/projects/project.hbs
@@ -3,9 +3,11 @@
 <br>
 <br>
 
-<strong>Name:</strong>
-<input value={{this.name}} oninput={{action (mut this.name) value="target.value"}} />
-<a {{on "click" (fn this.createTask this.name)}} role="button">Create task</a>
+<label>
+  <strong>Name:</strong>
+  <input value={{this.name}} {{on "input" this.setName}} />
+</label>
+<button type="button" {{on "click" (fn this.createTask this.name)}}>Create task</button>
 
 <br>
 <br>
@@ -16,7 +18,7 @@
 
     {{#each this.model.tasks as |task|}}
       <LinkTo @route="tasks.task" @model={{task}}>{{task.name}}</LinkTo> -
-      <a {{on "click" (fn this.deleteTask task)}} role="button">Delete</a>
+      <button type="button" {{on "click" (fn this.deleteTask task)}}>Delete</button>
       <br>
     {{/each}}
   </div>
diff --git a/tests/dummy/app/templates/storage-for.hbs b/tests/dummy/app/templates/storage-for.hbs
index 2417962..2721e78 100644
--- a/tests/dummy/app/templates/storage-for.hbs
+++ b/tests/dummy/app/templates/storage-for.hbs
@@ -1,5 +1,5 @@
 <h3>Generator</h3>
-{{! template-lint-disable block-indentation}}
+{{! template-lint-disable block-indentation no-unbalanced-curlies}}
 Run <code>ember g storage -h</code> for all options.<br><br>
 
 <HighlightJs @lang="bash">
@@ -20,9 +20,9 @@ Open the developer tools and go to <code>Resources</code> -> <code>Local Storage
   {{! template-lint-disable simple-unless}}
   {{#unless this.settings.welcomeMessageSeen}}
     You will see this message until you click
-    <button {{on "click" this.toggleWelcomeMessage}}>X</button>
+    <button type="button" {{on "click" this.toggleWelcomeMessage}}>X</button>
   {{else}}
-    <button {{on "click" this.toggleWelcomeMessage}}>Undo</button>
+    <button type="button" {{on "click" this.toggleWelcomeMessage}}>Undo</button>
   {{/unless}}
 </div>