diff --git a/CHANGELOG.md b/CHANGELOG.md
index 527f790..f48871d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## v0.0.2 (2019-08-01)
+
+*   Tags added!
+
 ## v0.0.1 (2019-07-29)
 
-* Initial release!
+*   Initial release!
diff --git a/roles/main.tf b/roles/main.tf
index d3817a9..7b3d216 100644
--- a/roles/main.tf
+++ b/roles/main.tf
@@ -65,6 +65,7 @@ data "aws_iam_policy_document" "human_assume" {
 resource "aws_iam_role" "devops" {
   name               = var.devops_name
   assume_role_policy = data.aws_iam_policy_document.human_assume.json
+  tags               = local.tags
 }
 
 resource "aws_iam_role_policy" "devops" {
@@ -217,6 +218,7 @@ data "aws_iam_policy_document" "devops" {
 resource "aws_iam_role" "readonly" {
   name               = var.readonly_name
   assume_role_policy = data.aws_iam_policy_document.human_assume.json
+  tags               = local.tags
 }
 
 resource "aws_iam_policy_attachment" "readonly" {
@@ -232,6 +234,7 @@ resource "aws_iam_policy_attachment" "readonly" {
 resource "aws_iam_role" "superuser" {
   name               = var.superuser_name
   assume_role_policy = data.aws_iam_policy_document.human_assume.json
+  tags               = local.tags
 }
 
 resource "aws_iam_role_policy" "superuser" {
@@ -255,6 +258,7 @@ data "aws_iam_policy_document" "superuser" {
 resource "aws_iam_role" "support" {
   name               = var.support_name
   assume_role_policy = data.aws_iam_policy_document.human_assume.json
+  tags               = local.tags
 }
 
 resource "aws_iam_policy_attachment" "support" {
@@ -284,6 +288,7 @@ data "aws_iam_policy_document" "machine_assume" {
 resource "aws_iam_role" "metrics" {
   name               = var.metrics_name
   assume_role_policy = data.aws_iam_policy_document.machine_assume.json
+  tags               = local.tags
 }
 
 resource "aws_iam_role_policy" "metrics" {
@@ -317,4 +322,3 @@ data "aws_iam_policy_document" "metrics" {
     resources = ["*"]
   }
 }
-
diff --git a/user/main.tf b/user/main.tf
index c1c6c13..a21f1d0 100644
--- a/user/main.tf
+++ b/user/main.tf
@@ -12,4 +12,4 @@ resource "aws_iam_user_login_profile" "main" {
 resource "aws_iam_user_group_membership" "main" {
   user   = aws_iam_user.main.name
   groups = var.groups
-}
\ No newline at end of file
+}