diff --git a/docs/plugins.md b/docs/plugins.md
index 3841220..b2bfd28 100644
--- a/docs/plugins.md
+++ b/docs/plugins.md
@@ -6,7 +6,7 @@ Your `entitlements-app` config `config/entitlements.yaml` runs through ERB inter
 <%-
   unless ENV['CI_MODE']
     begin
-      require_relative "/data/entitlements/lib/entitlements-and-plugins"
+      require_relative "/data/entitlements-app/lib/entitlements-and-plugins"
     rescue Exception
       begin
         require_relative "lib/entitlements-and-plugins"
diff --git a/script/cibuild b/script/cibuild
index aed1132..d8e30d1 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -3,4 +3,4 @@ set -e
 
 cd "$(dirname "$0")/.."
 docker build -t entitlements -f spec/acceptance/Dockerfile.entitlements .
-docker run -w "/data/entitlements" entitlements bash -c "script/test"
+docker run -w "/data/entitlements-app" entitlements bash -c "script/test"
diff --git a/script/cibuild-entitlements-app-code-lint b/script/cibuild-entitlements-app-code-lint
index 8a3c309..070ba66 100755
--- a/script/cibuild-entitlements-app-code-lint
+++ b/script/cibuild-entitlements-app-code-lint
@@ -3,5 +3,5 @@ set -e
 
 cd "$(dirname "$0")/.."
 docker build -t entitlements -f spec/acceptance/Dockerfile.entitlements .
-docker run -w "/data/entitlements/" entitlements \
+docker run -w "/data/entitlements-app/" entitlements \
   bash -c "script/bootstrap && bin/rubocop "$@" lib/ spec/"
diff --git a/spec/acceptance/Dockerfile.entitlements b/spec/acceptance/Dockerfile.entitlements
index f3ae647..3c160f7 100644
--- a/spec/acceptance/Dockerfile.entitlements
+++ b/spec/acceptance/Dockerfile.entitlements
@@ -3,7 +3,7 @@ LABEL maintainer="GitHub Security Ops <opensource+entitlements-app@github.com>"
 ENV HOME /root
 ENV RELEASE=buster
 ENV container docker
-WORKDIR /data/entitlements
+WORKDIR /data/entitlements-app
 
 # Install dependency packages for bootstrapping and running...
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
@@ -15,11 +15,11 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
 RUN gem install bundler
 
 # Bootstrap files and caching for speed
-COPY "vendor/cache/" "/data/entitlements/vendor/cache/"
-COPY "script/" "/data/entitlements/script/"
-COPY [".rubocop.yml", ".ruby-version", "entitlements.gemspec", "Gemfile", "Gemfile.lock", "VERSION", "/data/entitlements/"]
+COPY "vendor/cache/" "/data/entitlements-app/vendor/cache/"
+COPY "script/" "/data/entitlements-app/script/"
+COPY [".rubocop.yml", ".ruby-version", "entitlements.gemspec", "Gemfile", "Gemfile.lock", "VERSION", "/data/entitlements-app/"]
 
 # Source Files
-COPY "bin/" "/data/entitlements/bin/"
-COPY "lib/" "/data/entitlements/lib/"
-COPY "spec/" "/data/entitlements/spec/"
+COPY "bin/" "/data/entitlements-app/bin/"
+COPY "lib/" "/data/entitlements-app/lib/"
+COPY "spec/" "/data/entitlements-app/spec/"
diff --git a/spec/acceptance/docker-compose.yml b/spec/acceptance/docker-compose.yml
index af35428..9ec596c 100644
--- a/spec/acceptance/docker-compose.yml
+++ b/spec/acceptance/docker-compose.yml
@@ -15,7 +15,7 @@ services:
           - entitlements.fake
     volumes:
       - "${DIR}/spec/acceptance:/acceptance:ro"
-      - "${DIR}/vendor/container-gems:/data/entitlements/vendor/gems:rw"
+      - "${DIR}/vendor/container-gems:/data/entitlements-app/vendor/gems:rw"
   git-server:
     entrypoint: /acceptance/git-server/run-server.sh
     image: jkarlos/git-server-docker
diff --git a/spec/acceptance/support/run-app.sh b/spec/acceptance/support/run-app.sh
index d7ca5fb..c1842e5 100755
--- a/spec/acceptance/support/run-app.sh
+++ b/spec/acceptance/support/run-app.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export DIR="/data/entitlements"
+export DIR="/data/entitlements-app"
 export SERVER="ldap-server.fake"
 
 begin_fold() {
@@ -99,7 +99,7 @@ if [ "$SUCCESS" -eq 0 ]; then
 fi
 
 export PATH="/usr/share/rbenv/shims:$PATH"
-cd "/data/entitlements"
+cd "/data/entitlements-app"
 FAILED_TEST=0
 for test in spec/acceptance/tests/*_spec.rb; do
   test_name=$(basename "$test" | sed -s 's/_spec\.rb$//')