diff --git a/plugins/git/install b/plugins/git/install
index bb13e8ef7..8e6cdbc1c 100755
--- a/plugins/git/install
+++ b/plugins/git/install
@@ -9,6 +9,9 @@ trigger-git-install() {
   declare desc="installs the git plugin"
   declare trigger="install"
 
+  mkdir -p "${DOKKU_LIB_ROOT}/data/git"
+  chown -R "${DOKKU_SYSTEM_USER}:${DOKKU_SYSTEM_GROUP}" "${DOKKU_LIB_ROOT}/data/git"
+
   fn-plugin-property-setup "git"
   migrate_git_vars_0_12_0 "$@"
 }
diff --git a/plugins/git/internal-functions b/plugins/git/internal-functions
index ec1b141bf..adaf04402 100755
--- a/plugins/git/internal-functions
+++ b/plugins/git/internal-functions
@@ -189,7 +189,7 @@ EOF
 fn-git-clone() {
   declare desc="creates an app from remote git repo"
   declare APP="$1" GIT_REMOTE="$2" GIT_REF="$2"
-  local APP_CLONE_ROOT="$PLUGIN_DATA_ROOT/$APP"
+  local APP_CLONE_ROOT="$DOKKU_LIB_ROOT/data/git/$APP"
   local APP_ROOT="$DOKKU_ROOT/$APP"
   [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"