diff --git a/buildbot/master/master.cfg b/buildbot/master/master.cfg
index 4dc1bd4..d698003 100644
--- a/buildbot/master/master.cfg
+++ b/buildbot/master/master.cfg
@@ -330,14 +330,14 @@ kovriDragonflyFactory.addStep(steps.Test(name="benchmark", command=["./build/kov
 kovriStaticFactory = util.BuildFactory()
 kovriStaticFactory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True))
 kovriStaticFactory.addStep(steps.Compile(command=["make", "release-static"]))
-kovriStaticFactory.addStep(steps.ShellCommand(name='package', description='packaging', descriptionDone='package', command = ['bash', '-x', './pkg/kovri-install.sh', '-p', '-c', '-f', util.Interpolate('kovri-latest-%(prop:platform)s.tar.bz2')]))
+kovriStaticFactory.addStep(steps.ShellCommand(name='package', description='packaging', descriptionDone='package', command = ['bash', '-x', './pkg/installers/kovri-install.sh', '-p', '-c', '-f', util.Interpolate('kovri-latest-%(prop:platform)s.tar.bz2')]))
 kovriStaticFactory.addStep(steps.FileUpload(slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2")))
 kovriStaticFactory.addStep(steps.FileUpload(name="upload hashes", slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt")))
 
 kovriStaticBsdFactory = util.BuildFactory()
 kovriStaticBsdFactory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True))
 kovriStaticBsdFactory.addStep(steps.Compile(command=["gmake", "release-static"]))
-kovriStaticBsdFactory.addStep(steps.ShellCommand(name='package', description='packaging', descriptionDone='packaged', command = ['bash', '-x', './pkg/kovri-install.sh', '-p', '-c', '-f', util.Interpolate('kovri-latest-%(prop:platform)s.tar.bz2')]))
+kovriStaticBsdFactory.addStep(steps.ShellCommand(name='package', description='packaging', descriptionDone='packaged', command = ['bash', '-x', './pkg/installers/kovri-install.sh', '-p', '-c', '-f', util.Interpolate('kovri-latest-%(prop:platform)s.tar.bz2')]))
 kovriStaticBsdFactory.addStep(steps.FileUpload(slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2")))
 kovriStaticBsdFactory.addStep(steps.FileUpload(name="upload hashes", slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt")))
 kovriStaticBsdFactory.addStep(steps.RemoveDirectory(dir='build/build', hideStepIf=True))
@@ -345,14 +345,14 @@ kovriStaticBsdFactory.addStep(steps.RemoveDirectory(dir='build/build', hideStepI
 kovriStaticWin32Factory = util.BuildFactory()
 kovriStaticWin32Factory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True))
 kovriStaticWin32Factory.addStep(steps.Compile(command=["make", "release-static"],env={'MSYSTEM': "MINGW32"}))
-kovriStaticWin32Factory.addStep(steps.ShellCommand(name='package', description='packaging', descriptionDone='packaged', env={'PATH': ["C:\msys32\usr\\bin\\core_perl", "${PATH}"]}, command = ['bash', '-x', './pkg/kovri-install.sh', '-p', '-c', '-f', util.Interpolate('kovri-latest-%(prop:platform)s.zip')]))
+kovriStaticWin32Factory.addStep(steps.ShellCommand(name='package', description='packaging', descriptionDone='packaged', env={'PATH': ["C:\msys32\usr\\bin\\core_perl", "${PATH}"]}, command = ['bash', '-x', './pkg/installers/kovri-install.sh', '-p', '-c', '-f', util.Interpolate('kovri-latest-%(prop:platform)s.zip')]))
 kovriStaticWin32Factory.addStep(steps.FileUpload(slavesrc=WithProperties("kovri-latest-%(platform)s.zip"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.zip"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.zip")))
 kovriStaticWin32Factory.addStep(steps.FileUpload(name="upload hashes", slavesrc=WithProperties("kovri-latest-%(platform)s.zip.sha256sum.txt"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.zip.sha256sum.txt"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.zip.sha256sum.txt")))
 
 kovriStaticWin64Factory = util.BuildFactory()
 kovriStaticWin64Factory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True))
 kovriStaticWin64Factory.addStep(steps.Compile(command=["make", "release-static"],env={'MSYSTEM': "MINGW64"}))
-kovriStaticWin64Factory.addStep(steps.ShellCommand(name='package', description='packaging', descriptionDone='packaged', env={'PATH': ["C:\msys64\usr\\bin\\core_perl", "${PATH}"]}, command = ['bash', '-x', './pkg/kovri-install.sh', '-p', '-c', '-f', util.Interpolate('kovri-latest-%(prop:platform)s.zip')]))
+kovriStaticWin64Factory.addStep(steps.ShellCommand(name='package', description='packaging', descriptionDone='packaged', env={'PATH': ["C:\msys64\usr\\bin\\core_perl", "${PATH}"]}, command = ['bash', '-x', './pkg/installers/kovri-install.sh', '-p', '-c', '-f', util.Interpolate('kovri-latest-%(prop:platform)s.zip')]))
 kovriStaticWin64Factory.addStep(steps.FileUpload(slavesrc=WithProperties("kovri-latest-%(platform)s.zip"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.zip"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.zip")))
 kovriStaticWin64Factory.addStep(steps.FileUpload(name="upload hashes", slavesrc=WithProperties("kovri-latest-%(platform)s.zip.sha256sum.txt"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.zip.sha256sum.txt"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.zip.sha256sum.txt")))