diff --git a/addon/components/paper-card-avatar.hbs b/addon/components/paper-card-avatar.hbs
new file mode 100644
index 000000000..6f80fc8b4
--- /dev/null
+++ b/addon/components/paper-card-avatar.hbs
@@ -0,0 +1,3 @@
+<md-card-avatar ...attributes>
+  {{yield}}
+</md-card-avatar>
\ No newline at end of file
diff --git a/addon/components/paper-card-avatar.js b/addon/components/paper-card-avatar.js
index eac64760f..6c097799c 100644
--- a/addon/components/paper-card-avatar.js
+++ b/addon/components/paper-card-avatar.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,6 +8,6 @@ import Component from '@ember/component';
  * @class PaperCardAvatar
  * @extends Ember.Component
  */
-export default Component.extend({
-  tagName: 'md-card-avatar'
-});
+export default class PaperCardAvatar extends Component {
+  tagName = '';
+}