diff --git a/.github/workflows/concept-library-container.yaml b/.github/workflows/concept-library-container.yaml
index 558fafb30..da19f3b99 100644
--- a/.github/workflows/concept-library-container.yaml
+++ b/.github/workflows/concept-library-container.yaml
@@ -5,8 +5,8 @@ on:
     # Only consider PRs that change files for this asset, including ci scripts
     paths:
       - '.github/workflows/concept-library-container.yaml'
-      - './CodeListLibrary_project/**'
-      - './docker/**'
+      - 'CodeListLibrary_project/**'
+      - 'docker/**'
   push:
     # Only release off of release and maintenance branches for this asset
     branches:
@@ -14,8 +14,8 @@ on:
     # Only consider pushes that change files for this asset, including ci scripts
     paths:
       - '.github/workflows/concept-library-container.yaml'
-      - './CodeListLibrary_project/**'
-      - './docker/**'
+      - 'CodeListLibrary_project/**'
+      - 'docker/**'
 
 permissions:
   contents: write
diff --git a/.github/workflows/sonarqube.yaml b/.github/workflows/sonarqube.yaml
index a3b3d02f2..924831228 100644
--- a/.github/workflows/sonarqube.yaml
+++ b/.github/workflows/sonarqube.yaml
@@ -18,7 +18,6 @@ on:
       - '.github/workflows/sonarqube.yaml'
       - 'CodeListLibrary_project/**'
       - 'docker/**'
-      - 'docs/**'
 
 jobs:
   scan-code:
diff --git a/docker/app/app.Dockerfile b/docker/app/app.Dockerfile
index 446837ebe..a8dc39f70 100644
--- a/docker/app/app.Dockerfile
+++ b/docker/app/app.Dockerfile
@@ -32,6 +32,21 @@ RUN apt-get update -y -q && \
 RUN mkdir -p /var/www/concept_lib_sites/v1 && \
     mkdir -p /home/config_cll/cll_srvr_logs
 
+# Set perms
+RUN chown -R www-data:www-data /var/www /home/config_cll && \
+    chmod -R 750 /home/config_cll
+
+# Cleanup
+RUN apt-get autoremove -y -q && \
+    apt-get clean -y -q
+
+
+####################################
+##                                ##
+##             Build              ##
+##                                ##
+####################################
+FROM base AS builder
 # Copy script volume(s)
 COPY ./docker/app/scripts/build /bin/scripts
 COPY ./docker/app/scripts/init /home/config_cll/init
@@ -43,27 +58,19 @@ COPY ./docker/requirements /var/www/concept_lib_sites/v1/requirements
 # Copy app volume(s)
 COPY ./CodeListLibrary_project /var/www/concept_lib_sites/v1/CodeListLibrary_project
 
-# Set perms
-RUN chown -R www-data:www-data /var/www /home/config_cll && \
-    chmod -R 750 /home/config_cll
-
 RUN find /bin/scripts -type f -iname "*.sh" -exec chmod a+x {} \; && \
     find /home/config_cll -type f -iname "*.sh" -exec chmod a+x {} \;
 
 # Config & install dependencies
 RUN /bin/scripts/dependencies.sh /var/www/concept_lib_sites/v1/requirements/${dependency_target:-production.txt}
 
-# Cleanup
-RUN apt-get autoremove -y -q && \
-    apt-get clean -y -q
-
 
 ####################################
 ##                                ##
 ##              Dev               ##
 ##                                ##
 ####################################
-FROM base AS dev
+FROM builder AS dev
 WORKDIR /var/www/concept_lib_sites/v1/CodeListLibrary_project
 
 
@@ -72,7 +79,7 @@ WORKDIR /var/www/concept_lib_sites/v1/CodeListLibrary_project
 ##              Prod              ##
 ##                                ##
 ####################################
-FROM base AS prod
+FROM builder AS prod
 
 # Config supervisord
 ADD ./docker/app/config/cll.supervisord.conf /etc/supervisord.conf