diff --git a/make/git-submod.mk b/make/git-submod.mk
index 76f71c08..a936058b 100644
--- a/make/git-submod.mk
+++ b/make/git-submod.mk
@@ -10,7 +10,7 @@ endif
 
 SUBMOD_SRC_DIR              ?= .
 GIT_SRV_ADMIN_SH             = ssh $(JANWARE_USER_PREFIX)git.janware.com /opt/jw-pkg/bin/git-srv-admin.sh
-GIT_REPO_URL                 = ssh://$(JANWARE_USER_PREFIX)git.janware.com/srv/git/$(JANWARE_USER)/contrib/$(SUBMOD_PKG_NAME)
+GIT_REPO_URL                 = ssh://$(JANWARE_USER_PREFIX)git.janware.com/$(JANWARE_USER)/contrib/$(SUBMOD_PKG_NAME)
 SUBMOD_PATH                  = $(patsubst $(abspath $(TOPDIR))/%,%,$(abspath $(CWD)/$(SUBMOD_SRC_DIR)))
 SUB_GIT                      = git -C $(SUBMOD_SRC_DIR)
 
diff --git a/make/projects-dir-minimal.mk b/make/projects-dir-minimal.mk
index 040481b2..ff3aa86d 100644
--- a/make/projects-dir-minimal.mk
+++ b/make/projects-dir-minimal.mk
@@ -29,7 +29,7 @@ ifeq ($(origin PROJECTS_DIR_REMOTE_BASE),undefined)
   endif
 endif
 
-ifneq ($(findstring ssh://git.janware.com/srv/git,$(PROJECTS_DIR_REMOTE_BASE)),)
+ifneq ($(findstring ssh://git.janware.com/,$(PROJECTS_DIR_REMOTE_BASE)),)
   $(warning Using janware private SSH: $(PROJECTS_DIR_REMOTE_BASE))
   PROJECTS_DIR_REMOTE_USER_SUBPATH ?= /proj
 else ifneq ($(findstring ssh://git.janware.com,$(PROJECTS_DIR_REMOTE_BASE)),)
diff --git a/make/topdir.mk b/make/topdir.mk
index da637bb0..c0522179 100644
--- a/make/topdir.mk
+++ b/make/topdir.mk
@@ -37,7 +37,7 @@ endif
 
 include $(JWBDIR)/make/defs.mk
 
-REMOTE_GIT_DIR               = /srv/git/$(JANWARE_USER)/$(REMOTE_GIT_FLAVOUR)/$(PROJECT)
+REMOTE_GIT_DIR               = /$(JANWARE_USER)/$(REMOTE_GIT_FLAVOUR)/$(PROJECT)
 REMOTE_GIT_URL               = ssh://$(JANWARE_USER_PREFIX)git.janware.com$(REMOTE_GIT_DIR)
 
 ifneq ($(DONT_CHECK_PREREQ_DONE),true)
diff --git a/scripts/pgit.sh b/scripts/pgit.sh
index a6cb8e27..d8920378 100644
--- a/scripts/pgit.sh
+++ b/scripts/pgit.sh
@@ -312,7 +312,7 @@ log "JW_PKG_SSH_EXTRA_OPTS=$JW_PKG_SSH_EXTRA_OPTS"
 cur=0
 SSH=ssh
 [ "$GIT_SSH" ] && SSH=$GIT_SSH
-global_remote_base="ssh://git.janware.com/srv/git"
+global_remote_base="ssh://git.janware.com"
 
 while [ "${1:0:1}" = - ]; do
 	case "$1" in