diff --git a/dependency_manager/src/edm_tool/__init__.py b/dependency_manager/src/edm_tool/__init__.py
index 74605d2..ea768d1 100644
--- a/dependency_manager/src/edm_tool/__init__.py
+++ b/dependency_manager/src/edm_tool/__init__.py
@@ -4,7 +4,8 @@
 #
 """Everest Dependency Manager."""
 from edm_tool import edm
-__version__ = "0.6.2"
+
+__version__ = "0.7.1"
 
 
 def get_parser():
diff --git a/dependency_manager/src/edm_tool/edm.py b/dependency_manager/src/edm_tool/edm.py
index ead24cf..76d2147 100755
--- a/dependency_manager/src/edm_tool/edm.py
+++ b/dependency_manager/src/edm_tool/edm.py
@@ -411,10 +411,22 @@ def get_git_repo_info(cls, repo_path: Path, fetch=False) -> dict:
         """
         Return useful information about a repository a the given path.
 
-        TODO: return type should be a well defined object
-        Returns an empty dictionary if the path is no git repo
+        Returns a default dictionary if the path is no git repo
         """
-        repo_info = {'is_repo': False}
+        repo_info = {
+            'is_repo': False,
+            'fetch_worked': None,
+            'remote_branch': None,
+            'behind': None,
+            'ahead': None,
+            'tag': None,
+            'branch': None,
+            'dirty': None,
+            'detached': None,
+            'rev': None,
+            'short_rev': None,
+            'url': None,
+        }
         if GitInfo.is_repo(repo_path):
             repo_info["is_repo"] = True
             if fetch:
@@ -1628,9 +1640,9 @@ def get_parser(version) -> argparse.ArgumentParser:
         type=str,
         action="append",
         help="Bazel-style label for the build files into the deppendencies. " +
-             "The format should be `@<workspace>//<path>:BUILD.<dependency-name>.bazel`." + 
+             "The format should be `@<workspace>//<path>:BUILD.<dependency-name>.bazel`." +
              "<dependency-name> should correspond to the name of the dependency in " +
-             "the dependencies.yaml file. This option can be used multiple times." + 
+             "the dependencies.yaml file. This option can be used multiple times." +
              "If not provided, Bazel will search for BUILD file in the repo itself.",
         required=False)
 
diff --git a/dependency_manager/src/edm_tool/templates/cpm.jinja b/dependency_manager/src/edm_tool/templates/cpm.jinja
index d9315b0..38bd8f1 100644
--- a/dependency_manager/src/edm_tool/templates/cpm.jinja
+++ b/dependency_manager/src/edm_tool/templates/cpm.jinja
@@ -52,7 +52,7 @@ endif()
 {% endfor %}
 
 execute_process(
-    COMMAND edm release --everest-core-dir ${PROJECT_SOURCE_DIR} --build-dir ${CMAKE_BINARY_DIR} --out ${CMAKE_BINARY_DIR}/release.json
+    COMMAND "${EVEREST_DEPENDENCY_MANAGER}" release --everest-core-dir ${PROJECT_SOURCE_DIR} --build-dir ${CMAKE_BINARY_DIR} --out ${CMAKE_BINARY_DIR}/release.json
 )
 
 install(