diff --git a/Makefile b/Makefile
index e26609e..c91fc70 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,6 @@ export LD_LIBRARY_PATH := /opt/rh/rh-ruby22/root/usr/lib64${LD_LIBRARY_PATH:+:${
 export MANPATH := /opt/rh/rh-ruby22/root/usr/share/man:$MANPATH
 export PKG_CONFIG_PATH := /opt/rh/rh-ruby22/root/usr/lib64/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}
 export XDG_DATA_DIRS := /opt/rh/rh-ruby22/root/usr/share${XDG_DATA_DIRS:+:${XDG_DATA_DIRS}}
-export LD_LIBRARY_PATH := /opt/rh/rh-ruby22/root/usr/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
-export MANPATH := /opt/rh/rh-ruby22/root/usr/share/man:$MANPATH
-export PKG_CONFIG_PATH := /opt/rh/rh-ruby22/root/usr/lib64/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}
-export XDG_DATA_DIRS := /opt/rh/rh-ruby22/root/usr/share${XDG_DATA_DIRS:+:${XDG_DATA_DIRS}}
 
 VERSION = 8.5
 TARBALL = gitlab-deps-$(VERSION).tar.gz
@@ -14,14 +10,14 @@ PREFIX = /usr
 WGET = wget
 GITLAB_BRANCH = 8-5-stable
 BUNDLE_OPTS = --verbose --without='development test'
+BUNDLE = LD_LIBRARY_PATH=/opt/rh/rh-ruby22/root/usr/lib64/ /opt/rh/rh-ruby22/root/bin/bundle
 
 all:
-	ruby -v
-	bundle install $(BUNDLE_OPTS) --local --deployment
+	$(BUNDLE) install $(BUNDLE_OPTS) --local --deployment
 	grep -rl '/this/will/be/overwritten/or/wrapped/anyways/do/not/worry/ruby' vendor/bundle/ruby/gems/*/bin | xargs --no-run-if-empty sed -i -e '1 s|.*|#!/usr/bin/env ruby|'
 
 	# Change ruby interpreter, to use rh-ruby22
-	grep -rl '#!/usr/bin/env ruby' vendor/bundle/ruby/gems/ | xargs --no-run-if-empty sed -i -e 's|.*|#!/opt/rh/rh-ruby22/root/usr/bin/ruby |'
+	grep -rl '#!/usr/bin/env ruby' vendor/ | xargs --no-run-if-empty sed -i -e '1 s|.*|#!/opt/rh/rh-ruby22/root/usr/bin/ruby|'
 
 dist: $(TARBALL)
 
@@ -34,13 +30,14 @@ install: all
 	install -m 0644 Gemfile.lock    $(DESTDIR)$(PREFIX)/lib/gitlab
 	cp -r .bundle                   $(DESTDIR)$(PREFIX)/lib/gitlab/.bundle
 	cp -r vendor/bundle             $(DESTDIR)$(PREFIX)/lib/gitlab/vendor/bundle
+	grep -rl '#!/usr/bin/env ruby' vendor/ | xargs --no-run-if-empty sed -i -e '1 s|.*|#!/opt/rh/rh-ruby22/root/usr/bin/ruby|'
 
 update: clean
 	$(WGET) -O Gemfile https://gitlab.com/gitlab-org/gitlab-ce/raw/$(GITLAB_BRANCH)/Gemfile
 	$(WGET) -O Gemfile.lock https://gitlab.com/gitlab-org/gitlab-ce/raw/$(GITLAB_BRANCH)/Gemfile.lock
 	echo 'gem "omniauth-remote-user", ">= 0.0.6"' >> Gemfile
-	bundle update
-	bundle install $(BUNDLE_OPTS) --path vendor/bundle
+	$(BUNDLE) update
+	$(BUNDLE) install $(BUNDLE_OPTS) --path vendor/bundle
 
 
 clean:
--
libgit2 0.21.2