diff --git a/deploy-agent/deployd/common/config.py b/deploy-agent/deployd/common/config.py
index ae406cd6d0..0257463fa8 100644
--- a/deploy-agent/deployd/common/config.py
+++ b/deploy-agent/deployd/common/config.py
@@ -105,7 +105,7 @@ def update_variables(self, deploy_status):
         if deploy_status.report.stageName:
             self._environ['STAGE_NAME'] = deploy_status.report.stageName
         if deploy_status.report.stageType:
-            self._environ['COMPUTE_ENV_TYPE'] = deploy_status.report.stageType
+            self._environ['COMPUTE_ENV_TYPE'] = "PRODUCTION" if deploy_status.report.stageType == "DEFAULT" else deploy_status.report.stageType
         if deploy_status.first_deploy:
             self._environ['FIRST_DEPLOY'] = str(deploy_status.first_deploy)
         if deploy_status.is_docker:
diff --git a/deploy-agent/tests/unit/deploy/common/test_config.py b/deploy-agent/tests/unit/deploy/common/test_config.py
index 809c58acc7..826fc2b8d7 100644
--- a/deploy-agent/tests/unit/deploy/common/test_config.py
+++ b/deploy-agent/tests/unit/deploy/common/test_config.py
@@ -55,7 +55,7 @@ def test_get_target(self):
         self.assertEqual(os.environ['DEPLOY_ID'], '123')
         self.assertEqual(os.environ['ENV_NAME'], 'pinboard')
         self.assertEqual(os.environ['STAGE_NAME'], 'beta')
-        self.assertEqual(os.environ['COMPUTE_ENV_TYPE'], 'DEFAULT')
+        self.assertEqual(os.environ['COMPUTE_ENV_TYPE'], 'PRODUCTION')
         self.assertEqual(self.config.get_target(), '/tmp/pinboard')
 
     def test_init(self):