diff --git a/Makefile-autobuilder.am b/Makefile-autobuilder.am
index 2fa7e54e..fbb8a55b 100644
--- a/Makefile-autobuilder.am
+++ b/Makefile-autobuilder.am
@@ -29,7 +29,7 @@ EXTRA_DIST += src/autobuilder/rpm-ostree-autobuilder.in
 bin_SCRIPTS += rpm-ostree-autobuilder \
 	$(NULL)
 
-jsautobuilderdir=$(pkgdatadir)/js
+jsautobuilderdir=$(pkgdatadir)-autobuilder/js
 jsautobuilder_DATA= \
 	src/autobuilder/js/argparse.js \
 	src/autobuilder/js/asyncutil.js \
@@ -70,7 +70,7 @@ jsautotasks_DATA= \
 	src/autobuilder/js/tasks/testbase.js \
 	$(NULL)
 
-testdatadir=$(pkgdatadir)
+testdatadir=$(pkgdatadir)-autobuilder
 testdata_DATA = src/autobuilder/rpm-ostree-export-journal-to-serialdev \
 	src/autobuilder/rpm-ostree-export-journal-to-serialdev.service \
 	$(NULL)
diff --git a/src/autobuilder/rpm-ostree-autobuilder.in b/src/autobuilder/rpm-ostree-autobuilder.in
index 258d9d0a..d56fab19 100755
--- a/src/autobuilder/rpm-ostree-autobuilder.in
+++ b/src/autobuilder/rpm-ostree-autobuilder.in
@@ -16,13 +16,13 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-jsdir=@pkgdatadir@/js
+jsdir=@pkgdatadir@-autobuilder/js
 
 export GI_TYPELIB_PATH="@pkglibdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
 export LD_LIBRARY_PATH="@pkglibdir@/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
 # Don't auto-spawn a session bus
 export GIO_USE_VFS=local
-export OSTBUILD_DATADIR=@pkgdatadir@
-export OSTBUILD_LIBDIR=@pkglibdir@
+export OSTBUILD_DATADIR=@pkgdatadir@-autobuilder
+export OSTBUILD_LIBDIR=@pkglibdir@-autobuilder
 
 exec $OSTBUILD_GDB gjs -I "${jsdir}" "${jsdir}/main.js" "$@"