diff --git a/package-lock.json b/package-lock.json
index 7441589..8c914b3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@microsoft/security-devops-azdevops-task-lib",
-    "version": "1.11.0",
+    "version": "1.12.0",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "@microsoft/security-devops-azdevops-task-lib",
-            "version": "1.11.0",
+            "version": "1.12.0",
             "license": "MIT",
             "dependencies": {
                 "adm-zip": "0.5.10",
diff --git a/package.json b/package.json
index c575e83..40314e2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@microsoft/security-devops-azdevops-task-lib",
-    "version": "1.11.0",
+    "version": "1.12.0",
     "description": "Microsoft Security DevOps for Azure DevOps task library.",
     "author": "Microsoft Corporation",
     "license": "MIT",
diff --git a/src/msdo-client.ts b/src/msdo-client.ts
index 8d0061b..3441544 100644
--- a/src/msdo-client.ts
+++ b/src/msdo-client.ts
@@ -24,6 +24,19 @@ async function setupEnvironment(): Promise<void> {
     
     console.log('------------------------------------------------------------------------------');
 
+    // initialize the _msdo directory
+    let agentDirectory = path.join(process.env.AGENT_ROOTDIRECTORY, '_msdo');
+    tl.debug(`agentDirectory = ${agentDirectory}`);
+    common.ensureDirectory(agentDirectory);
+
+    let agentPackagesDirectory = process.env.MSDO_PACKAGES_DIRECTORY;
+    if (!agentPackagesDirectory) {
+        agentPackagesDirectory = path.join(agentDirectory, 'packages');
+        tl.debug(`agentPackagesDirectory = ${agentPackagesDirectory}`);
+        common.ensureDirectory(agentPackagesDirectory);
+        process.env.MSDO_PACKAGES_DIRECTORY = agentPackagesDirectory;
+    }
+
     if (!process.env.MSDO_FILEPATH) {
         let cliVersion = resolveCliVersion();
         await installer.install(cliVersion);
diff --git a/src/msdo-installer.ts b/src/msdo-installer.ts
index 79a66b2..c665edf 100644
--- a/src/msdo-installer.ts
+++ b/src/msdo-installer.ts
@@ -31,19 +31,7 @@ export async function install(cliVersion: string): Promise<void> {
 
     let packageName = resolvePackageName();
 
-    // initialize the _msdo directory
     let agentDirectory = path.join(process.env.AGENT_ROOTDIRECTORY, '_msdo');
-    tl.debug(`agentDirectory = ${agentDirectory}`);
-    common.ensureDirectory(agentDirectory);
-
-    let agentPackagesDirectory = process.env.MSDO_PACKAGES_DIRECTORY;
-    if (!agentPackagesDirectory) {
-        agentPackagesDirectory = path.join(agentDirectory, 'packages');
-        tl.debug(`agentPackagesDirectory = ${agentPackagesDirectory}`);
-        common.ensureDirectory(agentPackagesDirectory);
-        process.env.MSDO_PACKAGES_DIRECTORY = agentPackagesDirectory;
-    }
-
     let agentVersionsDirectory = path.join(agentDirectory, 'versions');
     tl.debug(`agentVersionsDirectory = ${agentVersionsDirectory}`);
     common.ensureDirectory(agentVersionsDirectory);