diff --git a/.azure-pipelines/templates/changelog.yml b/.azure-pipelines/templates/changelog.yml
index 7619858a9..4a65e2c2b 100644
--- a/.azure-pipelines/templates/changelog.yml
+++ b/.azure-pipelines/templates/changelog.yml
@@ -4,7 +4,7 @@ jobs:
       vmImage: vs2017-win2016
     steps:
       - bash: |
-          CERTBOT_VERSION="$(python -c "import certbot; print(certbot.__version__)")"
+          CERTBOT_VERSION="$(cd certbot && python -c "import certbot; print(certbot.__version__)" && cd ~-)"
           "${BUILD_REPOSITORY_LOCALPATH}\tools\extract_changelog.py" "${CERTBOT_VERSION}" >> "${BUILD_ARTIFACTSTAGINGDIRECTORY}/release_notes.md"
         displayName: Prepare changelog
       - task: PublishPipelineArtifact@1
diff --git a/windows-installer/construct.py b/windows-installer/construct.py
index cdf309f13..8ebbba54c 100644
--- a/windows-installer/construct.py
+++ b/windows-installer/construct.py
@@ -119,8 +119,9 @@ imp.load_dynamic('pythoncom', pcom)
 
     installer_cfg_path = os.path.join(build_path, 'installer.cfg')
 
+    certbot_pkg_path = os.path.join(repo_path, 'certbot')
     certbot_version = subprocess.check_output([sys.executable, '-c', 'import certbot; print(certbot.__version__)'],
-                                              universal_newlines=True, cwd=repo_path).strip()
+                                              universal_newlines=True, cwd=certbot_pkg_path).strip()
 
     with open(installer_cfg_path, 'w') as file_h:
         file_h.write('''\