diff --git a/service/src/providers/aws-codebuild/index.ts b/service/src/providers/aws-codebuild/index.ts
index 9b25b58..fc118f8 100644
--- a/service/src/providers/aws-codebuild/index.ts
+++ b/service/src/providers/aws-codebuild/index.ts
@@ -58,10 +58,12 @@ let startBuildQueueProcessor = startAwsCodeBuildQueue.process(async data => {
   let actionSteps = steps.filter(s => s.type === 'action');
   let cleanupSteps = steps.filter(s => s.type === 'cleanup');
 
-  let envVars: Record<string, string> = await encryption.decrypt({
-    entityId: ctx.run.id,
-    encrypted: ctx.run.encryptedEnvironmentVariables
-  });
+  let envVars: Record<string, string> = JSON.parse(
+    await encryption.decrypt({
+      entityId: ctx.run.id,
+      encrypted: ctx.run.encryptedEnvironmentVariables
+    })
+  );
 
   let artifactData: Record<string, { bucket: string; storageKey: string }> = {};
 
diff --git a/service/src/providers/aws-codebuild/project.ts b/service/src/providers/aws-codebuild/project.ts
index 338331f..82d269e 100644
--- a/service/src/providers/aws-codebuild/project.ts
+++ b/service/src/providers/aws-codebuild/project.ts
@@ -10,7 +10,8 @@ import { env } from '../../env';
 import { codebuild, logsClient } from './codeBuild';
 import { ensureCodeBuildRole } from './role';
 
-let ProjectName = env.codeBuild.CODE_BUILD_PROJECT_NAME || 'metorial-forge-codebuild-role-v1';
+let ProjectName =
+  env.codeBuild.CODE_BUILD_PROJECT_NAME || 'metorial-forge-codebuild-project-v1';
 
 export let ensureProject = once(async () => {
   if (!codebuild || !logsClient) throw new Error('CodeBuild client not initialized');