diff --git a/.env.test b/.env.test
index 5cb19c2..47b6bb3 100644
--- a/.env.test
+++ b/.env.test
@@ -1,5 +1,5 @@
 RAILS_ENV=test
-APP_NAME=request-queue-time
-SERVER_ENVIRONMENT=stack-name
+DD_SERVICE=request-queue-time
+DD_ENV=stack-name
 
-AWS_REGION=eu-west-1
\ No newline at end of file
+AWS_REGION=eu-west-1
diff --git a/spec/services/reporter_spec.rb b/spec/services/reporter_spec.rb
index e925454..b7212f5 100644
--- a/spec/services/reporter_spec.rb
+++ b/spec/services/reporter_spec.rb
@@ -23,8 +23,8 @@
         unit: "Milliseconds",
         timestamp: Time.now,
         dimensions: [
-          {name: "service", value: ENV["APP_NAME"]},
-          {name: "environment", value: ENV["SERVER_ENVIRONMENT"]}
+          {name: "service", value: ENV["DD_SERVICE"]},
+          {name: "environment", value: ENV["DD_ENV"]}
         ]
       )
     end
@@ -45,8 +45,8 @@
           {
             metric_name: "request_queue_time",
             dimensions: [
-              {name: "service", value: ENV["APP_NAME"]},
-              {name: "environment", value: ENV["SERVER_ENVIRONMENT"]}
+              {name: "service", value: ENV["DD_SERVICE"]},
+              {name: "environment", value: ENV["DD_ENV"]}
             ],
             timestamp: Time.now,
             value: 42,
@@ -74,8 +74,8 @@
           {
             metric_name: "request_queue_time",
             dimensions: [
-              {name: "service", value: ENV["APP_NAME"]},
-              {name: "environment", value: ENV["SERVER_ENVIRONMENT"]}
+              {name: "service", value: ENV["DD_SERVICE"]},
+              {name: "environment", value: ENV["DD_ENV"]}
             ],
             timestamp: Time.now,
             value: 42,