diff --git a/addon/components/paper-card-header-headline.hbs b/addon/components/paper-card-header-headline.hbs
new file mode 100644
index 000000000..1c48e302b
--- /dev/null
+++ b/addon/components/paper-card-header-headline.hbs
@@ -0,0 +1,3 @@
+<span class="md-headline" ...attributes>
+  {{yield}}
+</span>
\ No newline at end of file
diff --git a/addon/components/paper-card-header-headline.js b/addon/components/paper-card-header-headline.js
index 41e69dc9b..2b04f4d1c 100644
--- a/addon/components/paper-card-header-headline.js
+++ b/addon/components/paper-card-header-headline.js
@@ -1,4 +1,4 @@
-/* eslint-disable ember/no-classic-components, ember/require-tagless-components, prettier/prettier */
+/* eslint-disable ember/no-classic-components */
 /**
  * @module ember-paper
  */
@@ -8,7 +8,6 @@ import Component from '@ember/component';
  * @class PaperCardHeaderHeadline
  * @extends Ember.Component
  */
-export default Component.extend({
-  tagName: 'span',
-  classNames: ['md-headline']
-});
+export default class PaperCardHeaderHeadline extends Component {
+  tagName = '';
+}