diff --git a/packer/provision.bash b/packer/provision.bash
index d047734..bf3ecd4 100644
--- a/packer/provision.bash
+++ b/packer/provision.bash
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -euxo pipefail
+set -euo pipefail
 
 : ${ADMIN_PASSWORD}
 : ${AWS_REGION}
diff --git a/tf/asg.tf b/tf/asg.tf
index 44ba421..91a1177 100644
--- a/tf/asg.tf
+++ b/tf/asg.tf
@@ -39,7 +39,7 @@ resource "aws_launch_template" "server" {
 
   name          = "riju-server"
   image_id      = data.aws_ami.server[count.index].id
-  instance_type = "t3.medium"
+  instance_type = "t3.small"
 
   security_group_names = [aws_security_group.server.name]
   iam_instance_profile {
@@ -62,9 +62,18 @@ resource "aws_launch_template" "server" {
 
   tag_specifications {
     resource_type = "instance"
-    tags = {
-      Name = "Riju server"
-    }
+    tags = merge(local.tags, {
+      Name               = "Riju server"
+      BillingSubcategory = "Riju:EC2:Webserver"
+    })
+  }
+
+  tag_specifications {
+    resource_type = "volume"
+    tags = merge(local.tags, {
+      Name               = "Riju server"
+      BillingSubcategory = "Riju:EBS:Webserver"
+    })
   }
 }
 
@@ -91,20 +100,6 @@ resource "aws_autoscaling_group" "server" {
         value               = "Riju server"
         propagate_at_launch = false
       }
-    ],
-    [
-      for key, value in local.tags : {
-        key                 = key,
-        value               = value,
-        propagate_at_launch = true,
-      }
-    ],
-    [
-      {
-        key                 = "BillingSubcategory"
-        value               = "Riju:EC2:Webserver"
-        propagate_at_launch = true
-      }
     ]
   )
 
diff --git a/tf/ec2.tf b/tf/ec2.tf
index b9557a8..1883ebb 100644
--- a/tf/ec2.tf
+++ b/tf/ec2.tf
@@ -45,7 +45,8 @@ resource "aws_instance" "dev_server" {
     volume_type = "gp3"
 
     tags = merge(local.tags, {
-      Name = "Riju dev server"
+      Name               = "Riju dev server"
+      BillingSubcategory = "Riju:EBS:DevServer"
     })
   }