diff --git a/packages/sfpowerscripts-cli/package-lock.json b/packages/sfpowerscripts-cli/package-lock.json
index 84bf47ffa..65952818a 100644
--- a/packages/sfpowerscripts-cli/package-lock.json
+++ b/packages/sfpowerscripts-cli/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@dxatscale/sfpowerscripts",
-  "version": "3.0.5",
+  "version": "3.0.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/packages/sfpowerscripts-cli/package.json b/packages/sfpowerscripts-cli/package.json
index f878e5023..92feb2016 100644
--- a/packages/sfpowerscripts-cli/package.json
+++ b/packages/sfpowerscripts-cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dxatscale/sfpowerscripts",
   "description": "Simple wrappers around sfdx commands to help set up CI/CD quickly",
-  "version": "3.0.5",
+  "version": "3.0.6",
   "author": "dxatscale",
   "bin": {
     "readVars": "./scripts/readVars.sh"
diff --git a/packages/sfpowerscripts-cli/src/commands/sfpowerscripts/changelog/generate.ts b/packages/sfpowerscripts-cli/src/commands/sfpowerscripts/changelog/generate.ts
index f3487ab78..d07adfd8c 100644
--- a/packages/sfpowerscripts-cli/src/commands/sfpowerscripts/changelog/generate.ts
+++ b/packages/sfpowerscripts-cli/src/commands/sfpowerscripts/changelog/generate.ts
@@ -1,5 +1,6 @@
 import { flags, SfdxCommand } from '@salesforce/command';
 import { Messages } from '@salesforce/core';
+import ArtifactFilePathFetcher, { ArtifactFilePaths } from "@dxatscale/sfpowerscripts.core/lib/artifacts/ArtifactFilePathFetcher";
 import PackageMetadata from "@dxatscale/sfpowerscripts.core/lib/PackageMetadata";
 import { ReleaseChangelog, Release, Artifact } from "@dxatscale/sfpowerscripts.core/lib/changelog/interfaces/ReleaseChangelogInterfaces";
 import { Changelog as PackageChangelog } from "@dxatscale/sfpowerscripts.core/lib/changelog/interfaces/GenericChangelogInterfaces";
@@ -8,7 +9,6 @@ import * as fs from "fs-extra"
 import path = require('path');
 import simplegit, { SimpleGit } from "simple-git/promise";
 const tmp = require('tmp');
-const glob = require("glob");
 
 
 Messages.importMessagesDirectory(__dirname);
@@ -19,7 +19,7 @@ export default class GenerateChangelog extends SfdxCommand {
   public static description = messages.getMessage('commandDescription');
 
   public static examples = [
-    `$ sfdx sfpowerscripts:changelog:generate -n <releaseName> -d path/to/artifact/directory -w <regexp> -r <repoURL> -b <branchName> `
+    `$ sfdx sfpowerscripts:changelog:generate -n <releaseName> -d path/to/artifact/directory -w <regexp> -r <repoURL> -b <branchName>`
   ];
 
   protected static requiresUsername = false;
@@ -87,16 +87,11 @@ export default class GenerateChangelog extends SfdxCommand {
       git = simplegit(repoTempDir);
       await git.checkout(this.flags.branchname);
 
-
-      let packageMetadataFilepaths: string[] = glob.sync(
-        `**/artifact_metadata.json`,
-        {
-          cwd: path.resolve(process.cwd(), this.flags.artifactdir),
-          absolute: true
-        }
+      let artifact_filepaths: ArtifactFilePaths[] = ArtifactFilePathFetcher.fetchArtifactFilePaths(
+        this.flags.artifactdir
       );
 
-      if (packageMetadataFilepaths.length === 0) {
+      if (artifact_filepaths.length === 0) {
         throw new Error(`No artifacts found at ${path.resolve(process.cwd(), this.flags.artifactdir)}`);
       }
 
@@ -109,9 +104,11 @@ export default class GenerateChangelog extends SfdxCommand {
 
       // Read artifacts for latest release definition
       let missingChangelogs: Error[] = [];
-      for (let packageMetadataFilepath of packageMetadataFilepaths ) {
+      for (let artifactFilepaths of artifact_filepaths ) {
 
-        let packageMetadata: PackageMetadata = JSON.parse(fs.readFileSync(packageMetadataFilepath, 'utf8'));
+        let packageMetadata: PackageMetadata = JSON.parse(
+          fs.readFileSync(artifactFilepaths.packageMetadataFilePath, 'utf8')
+        );
 
         let artifact: Artifact = {
           name: packageMetadata["package_name"],
@@ -124,18 +121,13 @@ export default class GenerateChangelog extends SfdxCommand {
 
         latestReleaseDefinition["artifacts"].push(artifact);
 
-        let changelogFilepath: string = path.join(
-          path.dirname(packageMetadataFilepath),
-          `changelog.json`
-        );
-
-        if (!fs.existsSync(changelogFilepath)) {
+        if (!fs.existsSync(artifactFilepaths.changelogFilePath)) {
           missingChangelogs.push(
             new Error(`No changelog found in artifact ${packageMetadata["package_name"]} ${packageMetadata["package_version_number"]}`)
           );
         }
 
-        packageChangelogMap[packageMetadata["package_name"]] = changelogFilepath;
+        packageChangelogMap[packageMetadata["package_name"]] = artifactFilepaths.changelogFilePath;
       }
 
       if (missingChangelogs.length > 0) {
@@ -159,7 +151,6 @@ export default class GenerateChangelog extends SfdxCommand {
         for (let artifact of latestReleaseDefinition["artifacts"]) {
           for (let prevReleaseArtifact of prevReleaseDefinition["artifacts"]) {
             if (artifact["name"] === prevReleaseArtifact["name"]) {
-              // Verify that this modifies latestReleaseDefinition
               artifact["from"] = prevReleaseArtifact["to"];
               prevReleaseLatestCommitId[artifact["name"]] = prevReleaseArtifact["latestCommitId"];
               break;
@@ -170,7 +161,9 @@ export default class GenerateChangelog extends SfdxCommand {
 
       // Get commits for the latest release
       for (let artifact of latestReleaseDefinition["artifacts"]) {
-        let packageChangelog: PackageChangelog = JSON.parse(fs.readFileSync(packageChangelogMap[artifact["name"]], 'utf8'));
+        let packageChangelog: PackageChangelog = JSON.parse(
+          fs.readFileSync(packageChangelogMap[artifact["name"]], 'utf8')
+        );
 
         artifact["latestCommitId"] = packageChangelog["commits"][0]["commitId"];
 
@@ -239,7 +232,13 @@ export default class GenerateChangelog extends SfdxCommand {
         JSON.stringify(releaseChangelog, null, 4)
       );
 
-      let payload: string = generateMarkdown(releaseChangelog, this.flags.workitemurl, this.flags.limit, this.flags.showallartifacts);
+      let payload: string = generateMarkdown(
+        releaseChangelog,
+        this.flags.workitemurl,
+        this.flags.limit,
+        this.flags.showallartifacts
+      );
+
       fs.writeFileSync(
         path.join(repoTempDir,`Release-Changelog.md`),
         payload