diff --git a/Dockerfile b/Dockerfile
index 90efeeef..532d88ab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,9 +15,6 @@ RUN yarn run build -- --configuration sandbox --output-path=../dist
 # Backend Build
 #########################################################################################################
 FROM golang:1.18 as backend-build
-ENV FASTEN_COUCHDB_ADMIN_USERNAME=admin
-ENV FASTEN_COUCHDB_ADMIN_PASSWORD=mysecretpassword
-ENV FASTEN_ISSUER_JWT_KEY=mysessionpassword
 
 WORKDIR /go/src/github.com/fastenhealth/fastenhealth-onprem
 COPY . .
@@ -41,6 +38,10 @@ RUN mkdir -p /opt/fasten/db \
 #########################################################################################################
 FROM couchdb:3.2
 
+ENV FASTEN_COUCHDB_ADMIN_USERNAME=admin
+ENV FASTEN_COUCHDB_ADMIN_PASSWORD=mysecretpassword
+ENV FASTEN_ISSUER_JWT_KEY=mysessionpassword
+
 ARG S6_ARCH=amd64
 RUN curl https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-${S6_ARCH}.tar.gz -L -s --output /tmp/s6-overlay-${S6_ARCH}.tar.gz \
     && tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C / \
diff --git a/docker/couchdb/Dockerfile b/docker/couchdb/Dockerfile
index ca3db312..0e2aadab 100644
--- a/docker/couchdb/Dockerfile
+++ b/docker/couchdb/Dockerfile
@@ -15,6 +15,6 @@ RUN curl https://github.com/just-containers/s6-overlay/releases/download/v1.21.8
 
 COPY /docker/couchdb/fasten.ini /opt/couchdb/etc/local.ini
 COPY /docker/rootfs /
-RUN rm -rf /etc/services.d/fasten #delete the fasten app from the couchdbase container.
+RUN rm -rf /etc/services.d/fasten #delete the fasten app from the couchdb-only container.
 
 ENTRYPOINT ["/init"]