diff --git a/templates/Makefile_20.11.06 b/templates/Makefile_20.11.06
index a60a2b6..6907eed 100644
--- a/templates/Makefile_20.11.06
+++ b/templates/Makefile_20.11.06
@@ -15,8 +15,8 @@
 #     AUTHOR => [q[Koha Contributors <https://koha-community.org/>]]
 #     BUILD_REQUIRES => {  }
 #     CONFIGURE_REQUIRES => {  }
-#     INSTALLMAN1DIR => q[/home/koha/koha/man/man1]
-#     INSTALLMAN3DIR => q[/home/koha/koha/man/man3]
+#     INSTALLMAN1DIR => q[{{ koha_install_dir }}/man/man1]
+#     INSTALLMAN3DIR => q[{{ koha_install_dir }}/man/man3]
 #     NAME => q[koha]
 #     NO_META => q[1]
 #     PL_FILES => { fix-perl-path.PL=>[q[blib]], rewrite-config.PL=>[q[blib/KOHA_CONF_DIR/koha-conf.xml], q[blib/KOHA_CONF_DIR/koha-httpd.conf], q[blib/KOHA_CONF_DIR/log4perl.conf], q[blib/KOHA_CONF_DIR/koha-worker.service], q[blib/ZEBRA_CONF_DIR/etc/default.idx], q[blib/MISC_DIR/koha-install-log], q[blib/ZEBRA_CONF_DIR/etc/passwd], q[blib/ZEBRA_CONF_DIR/zebra-biblios-dom.cfg], q[blib/ZEBRA_CONF_DIR/zebra-authorities-dom.cfg], q[blib/ZEBRA_CONF_DIR/explain-authorities.xml], q[blib/ZEBRA_CONF_DIR/explain-biblios.xml], q[blib/ZEBRA_CONF_DIR/retrieval-info-auth-dom.xml], q[blib/ZEBRA_CONF_DIR/retrieval-info-bib-dom.xml], q[blib/SCRIPT_DIR/koha-zebra-ctl.sh], q[blib/SCRIPT_DIR/koha-pazpar2-ctl.sh], q[blib/SCRIPT_DIR/koha-index-daemon-ctl.sh], q[blib/PERL_MODULE_DIR/C4/Context.pm], q[blib/SCRIPT_NONDEV_DIR/kohalib.pl]] }
@@ -109,13 +109,13 @@ INSTALLSITESCRIPT = /usr/local/bin
 DESTINSTALLSITESCRIPT = $(DESTDIR)$(INSTALLSITESCRIPT)
 INSTALLVENDORSCRIPT = /usr/bin
 DESTINSTALLVENDORSCRIPT = $(DESTDIR)$(INSTALLVENDORSCRIPT)
-INSTALLMAN1DIR = /home/koha/koha/man/man1
+INSTALLMAN1DIR = {{ koha_install_dir }}/man/man1
 DESTINSTALLMAN1DIR = $(DESTDIR)$(INSTALLMAN1DIR)
 INSTALLSITEMAN1DIR = /usr/local/man/man1
 DESTINSTALLSITEMAN1DIR = $(DESTDIR)$(INSTALLSITEMAN1DIR)
 INSTALLVENDORMAN1DIR = /usr/share/man/man1
 DESTINSTALLVENDORMAN1DIR = $(DESTDIR)$(INSTALLVENDORMAN1DIR)
-INSTALLMAN3DIR = /home/koha/koha/man/man3
+INSTALLMAN3DIR = {{ koha_install_dir }}/man/man3
 DESTINSTALLMAN3DIR = $(DESTDIR)$(INSTALLMAN3DIR)
 INSTALLSITEMAN3DIR = /usr/local/man/man3
 DESTINSTALLSITEMAN3DIR = $(DESTDIR)$(INSTALLSITEMAN3DIR)
@@ -10559,76 +10559,76 @@ distsignature : distmeta
 # --- MakeMaker install section:
 
 KOHA_INST_API_CGI_DIR = blib/API_CGI_DIR
-KOHA_DEST_API_CGI_DIR = $(DESTDIR)/home/koha/koha/api
+KOHA_DEST_API_CGI_DIR = $(DESTDIR){{ koha_install_dir }}/api
 
 KOHA_INST_BACKUP_DIR = blib/BACKUP_DIR
-KOHA_DEST_BACKUP_DIR = $(DESTDIR)/home/koha/koha/var/spool
+KOHA_DEST_BACKUP_DIR = $(DESTDIR){{ koha_install_dir }}/var/spool
 
 KOHA_INST_DOC_DIR = blib/DOC_DIR
-KOHA_DEST_DOC_DIR = $(DESTDIR)/home/koha/koha/doc
+KOHA_DEST_DOC_DIR = $(DESTDIR){{ koha_install_dir }}/doc
 
 KOHA_INST_INTRANET_CGI_DIR = blib/INTRANET_CGI_DIR
-KOHA_DEST_INTRANET_CGI_DIR = $(DESTDIR)/home/koha/koha/intranet/cgi-bin
+KOHA_DEST_INTRANET_CGI_DIR = $(DESTDIR){{ koha_install_dir }}/intranet/cgi-bin
 
 KOHA_INST_INTRANET_TMPL_DIR = blib/INTRANET_TMPL_DIR
-KOHA_DEST_INTRANET_TMPL_DIR = $(DESTDIR)/home/koha/koha/intranet/htdocs/intranet-tmpl
+KOHA_DEST_INTRANET_TMPL_DIR = $(DESTDIR){{ koha_install_dir }}/intranet/htdocs/intranet-tmpl
 
 KOHA_INST_INTRANET_WWW_DIR = blib/INTRANET_WWW_DIR
-KOHA_DEST_INTRANET_WWW_DIR = $(DESTDIR)/home/koha/koha/intranet/htdocs
+KOHA_DEST_INTRANET_WWW_DIR = $(DESTDIR){{ koha_install_dir }}/intranet/htdocs
 
 KOHA_INST_KOHA_CONF_DIR = blib/KOHA_CONF_DIR
-KOHA_DEST_KOHA_CONF_DIR = $(DESTDIR)/home/koha/koha/etc
+KOHA_DEST_KOHA_CONF_DIR = $(DESTDIR){{ koha_install_dir }}/etc
 
 KOHA_INST_LOCK_DIR = blib/LOCK_DIR
-KOHA_DEST_LOCK_DIR = $(DESTDIR)/home/koha/koha/var/lock
+KOHA_DEST_LOCK_DIR = $(DESTDIR){{ koha_install_dir }}/var/lock
 
 KOHA_INST_LOG_DIR = blib/LOG_DIR
-KOHA_DEST_LOG_DIR = $(DESTDIR)/home/koha/koha/var/log
+KOHA_DEST_LOG_DIR = $(DESTDIR){{ koha_install_dir }}/var/log
 
 KOHA_INST_MAN_DIR = blib/MAN_DIR
-KOHA_DEST_MAN_DIR = $(DESTDIR)/home/koha/koha/man
+KOHA_DEST_MAN_DIR = $(DESTDIR){{ koha_install_dir }}/man
 
 KOHA_INST_MISC_DIR = blib/MISC_DIR
-KOHA_DEST_MISC_DIR = $(DESTDIR)/home/koha/koha/misc
+KOHA_DEST_MISC_DIR = $(DESTDIR){{ koha_install_dir }}/misc
 
 KOHA_INST_OPAC_CGI_DIR = blib/OPAC_CGI_DIR
-KOHA_DEST_OPAC_CGI_DIR = $(DESTDIR)/home/koha/koha/opac/cgi-bin
+KOHA_DEST_OPAC_CGI_DIR = $(DESTDIR){{ koha_install_dir }}/opac/cgi-bin
 
 KOHA_INST_OPAC_TMPL_DIR = blib/OPAC_TMPL_DIR
-KOHA_DEST_OPAC_TMPL_DIR = $(DESTDIR)/home/koha/koha/opac/htdocs/opac-tmpl
+KOHA_DEST_OPAC_TMPL_DIR = $(DESTDIR){{ koha_install_dir }}/opac/htdocs/opac-tmpl
 
 KOHA_INST_OPAC_WWW_DIR = blib/OPAC_WWW_DIR
-KOHA_DEST_OPAC_WWW_DIR = $(DESTDIR)/home/koha/koha/opac/htdocs
+KOHA_DEST_OPAC_WWW_DIR = $(DESTDIR){{ koha_install_dir }}/opac/htdocs
 
 KOHA_INST_PAZPAR2_CONF_DIR = blib/PAZPAR2_CONF_DIR
-KOHA_DEST_PAZPAR2_CONF_DIR = $(DESTDIR)/home/koha/koha/etc/pazpar2
+KOHA_DEST_PAZPAR2_CONF_DIR = $(DESTDIR){{ koha_install_dir }}/etc/pazpar2
 
 KOHA_INST_PERL_MODULE_DIR = blib/PERL_MODULE_DIR
-KOHA_DEST_PERL_MODULE_DIR = $(DESTDIR)/home/koha/koha/lib
+KOHA_DEST_PERL_MODULE_DIR = $(DESTDIR){{ koha_install_dir }}/lib
 
 KOHA_INST_PLUGINS_DIR = blib/PLUGINS_DIR
-KOHA_DEST_PLUGINS_DIR = $(DESTDIR)/home/koha/koha/var/lib/koha/plugins
+KOHA_DEST_PLUGINS_DIR = $(DESTDIR){{ koha_install_dir }}/var/lib/koha/plugins
 
 KOHA_INST_SCRIPT_DIR = blib/SCRIPT_DIR
-KOHA_DEST_SCRIPT_DIR = $(DESTDIR)/home/koha/koha/bin
+KOHA_DEST_SCRIPT_DIR = $(DESTDIR){{ koha_install_dir }}/bin
 
 KOHA_INST_SCRIPT_NONDEV_DIR = blib/SCRIPT_NONDEV_DIR
-KOHA_DEST_SCRIPT_NONDEV_DIR = $(DESTDIR)/home/koha/koha/bin
+KOHA_DEST_SCRIPT_NONDEV_DIR = $(DESTDIR){{ koha_install_dir }}/bin
 
 KOHA_INST_Z3950_CONF_DIR = blib/Z3950_CONF_DIR
-KOHA_DEST_Z3950_CONF_DIR = $(DESTDIR)/home/koha/koha/etc/z3950
+KOHA_DEST_Z3950_CONF_DIR = $(DESTDIR){{ koha_install_dir }}/etc/z3950
 
 KOHA_INST_ZEBRA_CONF_DIR = blib/ZEBRA_CONF_DIR
-KOHA_DEST_ZEBRA_CONF_DIR = $(DESTDIR)/home/koha/koha/etc/zebradb
+KOHA_DEST_ZEBRA_CONF_DIR = $(DESTDIR){{ koha_install_dir }}/etc/zebradb
 
 KOHA_INST_ZEBRA_DATA_DIR = blib/ZEBRA_DATA_DIR
-KOHA_DEST_ZEBRA_DATA_DIR = $(DESTDIR)/home/koha/koha/var/lib/zebradb
+KOHA_DEST_ZEBRA_DATA_DIR = $(DESTDIR){{ koha_install_dir }}/var/lib/zebradb
 
 KOHA_INST_ZEBRA_LOCK_DIR = blib/ZEBRA_LOCK_DIR
-KOHA_DEST_ZEBRA_LOCK_DIR = $(DESTDIR)/home/koha/koha/var/lock/zebradb
+KOHA_DEST_ZEBRA_LOCK_DIR = $(DESTDIR){{ koha_install_dir }}/var/lock/zebradb
 
 KOHA_INST_ZEBRA_RUN_DIR = blib/ZEBRA_RUN_DIR
-KOHA_DEST_ZEBRA_RUN_DIR = $(DESTDIR)/home/koha/koha/var/run/zebradb
+KOHA_DEST_ZEBRA_RUN_DIR = $(DESTDIR){{ koha_install_dir }}/var/run/zebradb
 
 install :: all install_koha set_koha_ownership set_koha_permissions warn_koha_env_vars
 	$(NOECHO) $(NOOP)
@@ -10699,7 +10699,7 @@ warn_koha_env_vars ::
 	$(NOECHO) $(ECHO) you should set the following environment variables:
 	$(NOECHO) $(ECHO)
 	$(NOECHO) $(ECHO) export KOHA_CONF=$(KOHA_DEST_KOHA_CONF_DIR)/koha-conf.xml
-	$(NOECHO) $(ECHO) export PERL5LIB=$(DESTDIR)/home/koha/koha/lib
+	$(NOECHO) $(ECHO) export PERL5LIB=$(DESTDIR){{ koha_install_dir }}/lib
 	$(NOECHO) $(ECHO)
 	$(NOECHO) $(ECHO) For other post-installation tasks, please consult the README.
 	$(NOECHO) $(ECHO)
@@ -18268,30 +18268,30 @@ config ::
 
 
 # --- MakeMaker postamble section:
-export __Z3950_CONF_DIR__ := $(DESTDIR)/home/koha/koha/etc/z3950
-export __BACKUP_DIR__ := $(DESTDIR)/home/koha/koha/var/spool
-export __SCRIPT_NONDEV_DIR__ := $(DESTDIR)/home/koha/koha/bin
-export __OPAC_WWW_DIR__ := $(DESTDIR)/home/koha/koha/opac/htdocs
-export __ZEBRA_RUN_DIR__ := $(DESTDIR)/home/koha/koha/var/run/zebradb
-export __KOHA_CONF_DIR__ := $(DESTDIR)/home/koha/koha/etc
-export __LOG_DIR__ := $(DESTDIR)/home/koha/koha/var/log
-export __INTRANET_TMPL_DIR__ := $(DESTDIR)/home/koha/koha/intranet/htdocs/intranet-tmpl
-export __MISC_DIR__ := $(DESTDIR)/home/koha/koha/misc
-export __ZEBRA_DATA_DIR__ := $(DESTDIR)/home/koha/koha/var/lib/zebradb
-export __OPAC_TMPL_DIR__ := $(DESTDIR)/home/koha/koha/opac/htdocs/opac-tmpl
-export __DOC_DIR__ := $(DESTDIR)/home/koha/koha/doc
-export __LOCK_DIR__ := $(DESTDIR)/home/koha/koha/var/lock
-export __MAN_DIR__ := $(DESTDIR)/home/koha/koha/man
-export __PLUGINS_DIR__ := $(DESTDIR)/home/koha/koha/var/lib/koha/plugins
-export __INTRANET_WWW_DIR__ := $(DESTDIR)/home/koha/koha/intranet/htdocs
-export __PAZPAR2_CONF_DIR__ := $(DESTDIR)/home/koha/koha/etc/pazpar2
-export __SCRIPT_DIR__ := $(DESTDIR)/home/koha/koha/bin
-export __INTRANET_CGI_DIR__ := $(DESTDIR)/home/koha/koha/intranet/cgi-bin
-export __ZEBRA_LOCK_DIR__ := $(DESTDIR)/home/koha/koha/var/lock/zebradb
-export __ZEBRA_CONF_DIR__ := $(DESTDIR)/home/koha/koha/etc/zebradb
-export __API_CGI_DIR__ := $(DESTDIR)/home/koha/koha/api
-export __PERL_MODULE_DIR__ := $(DESTDIR)/home/koha/koha/lib
-export __OPAC_CGI_DIR__ := $(DESTDIR)/home/koha/koha/opac/cgi-bin
+export __Z3950_CONF_DIR__ := $(DESTDIR){{ koha_install_dir }}/etc/z3950
+export __BACKUP_DIR__ := $(DESTDIR){{ koha_install_dir }}/var/spool
+export __SCRIPT_NONDEV_DIR__ := $(DESTDIR){{ koha_install_dir }}/bin
+export __OPAC_WWW_DIR__ := $(DESTDIR){{ koha_install_dir }}/opac/htdocs
+export __ZEBRA_RUN_DIR__ := $(DESTDIR){{ koha_install_dir }}/var/run/zebradb
+export __KOHA_CONF_DIR__ := $(DESTDIR){{ koha_install_dir }}/etc
+export __LOG_DIR__ := $(DESTDIR){{ koha_install_dir }}/var/log
+export __INTRANET_TMPL_DIR__ := $(DESTDIR){{ koha_install_dir }}/intranet/htdocs/intranet-tmpl
+export __MISC_DIR__ := $(DESTDIR){{ koha_install_dir }}/misc
+export __ZEBRA_DATA_DIR__ := $(DESTDIR){{ koha_install_dir }}/var/lib/zebradb
+export __OPAC_TMPL_DIR__ := $(DESTDIR){{ koha_install_dir }}/opac/htdocs/opac-tmpl
+export __DOC_DIR__ := $(DESTDIR){{ koha_install_dir }}/doc
+export __LOCK_DIR__ := $(DESTDIR){{ koha_install_dir }}/var/lock
+export __MAN_DIR__ := $(DESTDIR){{ koha_install_dir }}/man
+export __PLUGINS_DIR__ := $(DESTDIR){{ koha_install_dir }}/var/lib/koha/plugins
+export __INTRANET_WWW_DIR__ := $(DESTDIR){{ koha_install_dir }}/intranet/htdocs
+export __PAZPAR2_CONF_DIR__ := $(DESTDIR){{ koha_install_dir }}/etc/pazpar2
+export __SCRIPT_DIR__ := $(DESTDIR){{ koha_install_dir }}/bin
+export __INTRANET_CGI_DIR__ := $(DESTDIR){{ koha_install_dir }}/intranet/cgi-bin
+export __ZEBRA_LOCK_DIR__ := $(DESTDIR){{ koha_install_dir }}/var/lock/zebradb
+export __ZEBRA_CONF_DIR__ := $(DESTDIR){{ koha_install_dir }}/etc/zebradb
+export __API_CGI_DIR__ := $(DESTDIR){{ koha_install_dir }}/api
+export __PERL_MODULE_DIR__ := $(DESTDIR){{ koha_install_dir }}/lib
+export __OPAC_CGI_DIR__ := $(DESTDIR){{ koha_install_dir }}/opac/cgi-bin
 
 export __INSTALL_PAZPAR2__ := no
 export __ZEBRA_SRU_HOST__ := localhost
@@ -18331,7 +18331,7 @@ export __SMTP_HOST__ := localhost
 export __SMTP_PORT__ := 25
 export __RUN_DATABASE_TESTS__ := no
 export __TEMPLATE_CACHE_DIR__ := /tmp/koha
-export __INSTALL_BASE__ := /home/koha/koha
+export __INSTALL_BASE__ := {{ koha_install_dir }}
 export __ZEBRA_LANGUAGE__ := fr
 export __ZEBRA_MARC_FORMAT__ := unimarc
 
diff --git a/templates/plack/koha-plack.debug b/templates/plack/koha-plack.debug
index 7c88d29..b2a0139 100755
--- a/templates/plack/koha-plack.debug
+++ b/templates/plack/koha-plack.debug
@@ -23,7 +23,7 @@ set -e
 
 # Read configuration variable file if it is present
 [ -r /etc/default/koha-common ] && . /etc/default/koha-common
-export PERL5LIB=/home/koha/koha/lib
+export PERL5LIB={{ koha_install_dir }}/lib
 
 usage()
 {
@@ -53,9 +53,9 @@ start_plack()
 {
     local instancename=$1
 
-    local PIDFILE="/home/koha/koha/var/run/plack.pid"
-    local PLACKSOCKET="/home/koha/koha/var/run/plack.sock"
-    local PSGIFILE="/home/koha/koha/bin/plack/koha.psgi"
+    local PIDFILE="{{ koha_install_dir }}/var/run/plack.pid"
+    local PLACKSOCKET="{{ koha_install_dir }}/var/run/plack.sock"
+    local PSGIFILE="{{ koha_install_dir }}/bin/plack/koha.psgi"
     local NAME="${instancename}-koha-plack"
 
     if [ -e "/etc/koha/plack.psgi" ]; then
@@ -71,7 +71,7 @@ start_plack()
                  -E deployment --socket ${PLACKSOCKET} ${PSGIFILE}"
 
     if ! is_plack_running ${instancename}; then
-        export KOHA_CONF="/home/koha/koha/etc/koha-conf.xml"
+        export KOHA_CONF="{{ koha_install_dir }}/etc/koha-conf.xml"
         if [ -e "/etc/koha/koha-conf.xml" ]; then
             # pick instance-specific psgi file
             KOHA_CONF="/etc/koha/koha-conf.xml"
@@ -94,7 +94,7 @@ stop_plack()
 {
     local instancename=$1
 
-    local PIDFILE="/home/koha/koha/var/run/plack.pid"
+    local PIDFILE="{{ koha_install_dir }}/var/run/plack.pid"
 
     if is_plack_running ${instancename}; then
 
@@ -115,7 +115,7 @@ stop_plack()
 restart_plack()
 {
     local instancename=$1
-    local PIDFILE="/home/koha/koha/var/run/plack.pid"
+    local PIDFILE="{{ koha_install_dir }}/var/run/plack.pid"
 
     if is_plack_running ${instancename}; then
 
@@ -195,7 +195,7 @@ is_plack_running()
 {
     local instancename=$1
 
-    if start-stop-daemon --pidfile "/home/koha/koha/var/run/plack.pid" \
+    if start-stop-daemon --pidfile "{{ koha_install_dir }}/var/run/plack.pid" \
             --status ; then
         return 0
     else
diff --git a/templates/plack/koha.psgi b/templates/plack/koha.psgi
index 08d6a3b..93d4061 100644
--- a/templates/plack/koha.psgi
+++ b/templates/plack/koha.psgi
@@ -17,8 +17,8 @@
 
 use Modern::Perl;
 
-use lib("/home/koha/koha/lib");
-use lib("/home/koha/koha/lib/installer");
+use lib("{{ koha_install_dir }}/lib");
+use lib("{{ koha_install_dir }}/lib/installer");
 
 use Plack::Builder;
 use Plack::App::CGIBin;
@@ -54,16 +54,16 @@ use CGI qw(-utf8 ); # we will loose -utf8 under plack, otherwise
 }
 
 my $intranet = Plack::App::CGIBin->new(
-    root => '/home/koha/koha/intranet/cgi-bin'
+    root => '{{ koha_install_dir }}/intranet/cgi-bin'
 )->to_app;
 
 my $opac = Plack::App::CGIBin->new(
-    root => '/home/koha/koha/opac/cgi-bin/opac'
+    root => '{{ koha_install_dir }}/opac/cgi-bin/opac'
 )->to_app;
 
 my $apiv1  = builder {
     my $server = Mojo::Server::PSGI->new;
-    $server->load_app('/home/koha/koha/api/v1/app.pl');
+    $server->load_app('{{ koha_install_dir }}/api/v1/app.pl');
     $server->to_psgi_app;
 };