diff --git a/addon/components/paper-card.hbs b/addon/components/paper-card.hbs
index 4749579b0..37d26dc64 100644
--- a/addon/components/paper-card.hbs
+++ b/addon/components/paper-card.hbs
@@ -1,8 +1,10 @@
-{{yield (hash
-  title=(component "paper-card-title")
-  content=(component "paper-card-content")
-  actions=(component "paper-card-actions")
-  header=(component "paper-card-header")
-  image=(component "paper-card-image")
-  media=(component "paper-card-media")
-)}}
\ No newline at end of file
+<md-card ...attributes>
+  {{yield (hash
+    title=(component "paper-card-title")
+    content=(component "paper-card-content")
+    actions=(component "paper-card-actions")
+    header=(component "paper-card-header")
+    image=(component "paper-card-image")
+    media=(component "paper-card-media")
+  )}}
+</md-card>
\ No newline at end of file
diff --git a/addon/components/paper-card.js b/addon/components/paper-card.js
index d3d820984..0797f4ec0 100644
--- a/addon/components/paper-card.js
+++ b/addon/components/paper-card.js
@@ -1,4 +1,4 @@
-/* eslint-disable ember/no-classic-components, ember/require-tagless-components */
+/* eslint-disable ember/no-classic-components */
 /**
  * @module ember-paper
  */
@@ -8,6 +8,6 @@ import Component from '@ember/component';
  * @class PaperCard
  * @extends Ember.Component
  */
-export default Component.extend({
-  tagName: 'md-card',
-});
+export default class PaperCard extends Component {
+  tagName = '';
+}