diff --git a/terraform/s3.tf b/terraform/s3.tf
index b738422..385d39e 100644
--- a/terraform/s3.tf
+++ b/terraform/s3.tf
@@ -1,6 +1,6 @@
 
 resource "aws_s3_bucket" "s3_bucket" {
-  bucket = "mastodon-${random_pet.name.id}"
+  bucket = "mastodon-${local.domain_name}"
 }
 
 resource "aws_s3_bucket_ownership_controls" "s3_bucket" {
@@ -34,7 +34,7 @@ resource "aws_iam_access_key" "s3" {
 }
 
 resource "aws_iam_user" "s3" {
-  name = "mastodon-s3-${random_pet.name.id}"
+  name = "mastodon-s3-${local.domain_name}"
   path = "/system/"
 }