diff --git a/src/commands/print-tasks.ts b/src/commands/print-tasks.ts
index 5f6c06d6..b577b6f6 100644
--- a/src/commands/print-tasks.ts
+++ b/src/commands/print-tasks.ts
@@ -7,6 +7,7 @@ import { BuildRunner } from '~build-tasks/build-runner';
 import { Validator } from '~parser/validator';
 import { AwsUtil } from '~util/aws-util';
 import { ConsoleUtil } from '~util/console-util';
+import { GlobalState } from '~util/global-state';
 
 const commandName = 'print-tasks <tasksFile>';
 const commandDescription = 'Will print out all cloudformation templates that will be deployed by tasksFile';
@@ -60,7 +61,10 @@ export class PrintTasksCommand extends BaseCliCommand<IPrintTasksCommandArgs> {
 
         command.parsedParameters = this.parseCfnParameters(command.parameters);
         const config = new BuildConfiguration(tasksFile, command.parsedParameters, command.TemplatingContext);
-        await config.fixateOrganizationFile(command);
+        const template = await config.fixateOrganizationFile(command);
+        const state = await this.getState(command);
+
+        GlobalState.Init(state, template);
 
         const printTasks = config.enumPrintTasks(command);
 
diff --git a/src/commands/validate-tasks.ts b/src/commands/validate-tasks.ts
index 1a605d8c..627d5c68 100644
--- a/src/commands/validate-tasks.ts
+++ b/src/commands/validate-tasks.ts
@@ -6,6 +6,7 @@ import { BuildRunner } from '~build-tasks/build-runner';
 import { Validator } from '~parser/validator';
 import { AwsUtil } from '~util/aws-util';
 import { ConsoleUtil } from '~util/console-util';
+import { GlobalState } from '~util/global-state';
 
 const commandName = 'validate-tasks <tasksFile>';
 const commandDescription = 'Will validate the tasks file, including configured tasks';
@@ -55,8 +56,10 @@ export class ValidateTasksCommand extends BaseCliCommand<IPerformTasksCommandArg
 
         command.parsedParameters = this.parseCfnParameters(command.parameters);
         const config = new BuildConfiguration(tasksFile, command.parsedParameters, command.TemplatingContext);
+        const template = await config.fixateOrganizationFile(command);
+        const state = await this.getState(command);
 
-        await config.fixateOrganizationFile(command);
+        GlobalState.Init(state, template);
         const validationTasks = config.enumValidationTasks(command);
 
         if (command.match) {