diff --git a/Dockerfile b/Dockerfile
index eb43c9ce..c04bebb6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,6 @@
-FROM ubuntu:latest
+FROM node:18-alpine 
 WORKDIR /REMS
-COPY . .
-CMD ./dockerRunner.sh
\ No newline at end of file
+COPY --chown=node:node . .
+RUN npm install
+EXPOSE 8090
+CMD npm run start
\ No newline at end of file
diff --git a/Dockerfile.dev b/Dockerfile.dev
index a8f56aee..38c2ab9e 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -3,4 +3,5 @@ WORKDIR /REMS
 COPY --chown=node:node . .
 RUN npm install
 EXPOSE 8090
+EXPOSE 8091
 CMD ./dockerRunnerDev.sh
\ No newline at end of file
diff --git a/Dockerfile.porter-windows b/Dockerfile.porter-windows
deleted file mode 100644
index b7c5b532..00000000
--- a/Dockerfile.porter-windows
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM ubuntu:latest
-WORKDIR /porter
-RUN apt update
-RUN apt -y install curl
-RUN curl -fsSL https://get.docker.com -o get-docker.sh
-RUN chmod u+x get-docker.sh
-RUN ./get-docker.sh
-RUN curl -L https://cdn.porter.sh/latest/install-linux.sh | bash
-RUN export PATH="$PATH:~/.porter"
-ENV PATH="$PATH:~/.porter" 
diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl
deleted file mode 100644
index e0ba4b9e..00000000
--- a/Dockerfile.tmpl
+++ /dev/null
@@ -1,11 +0,0 @@
-# Docker file specifying  MITRE SSL certificates for a Full Stack CNAB invocation image
-FROM ubuntu:latest
-
-ARG BUNDLE_DIR
-ARG DEBIAN_FRONTEND=noninteractive
-ENV DEBIAN_FRONTEND=noninteractive
-
-COPY ./mongo-init.js ${BUNDLE_DIR}/mongo-init.js
-COPY ./.cnab/app/porter.yaml ${BUNDLE_DIR}/porter.yaml
-COPY ./docker-compose-porter.yml ${BUNDLE_DIR}/docker-compose-porter.yml
-COPY ./.env ${BUNDLE_DIR}/.env
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index abaa1eef..2e2c8f46 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -45,7 +45,7 @@ services:
       MONGO_INITDB_ROOT_USERNAME: rems-admin-pims-root
       MONGO_INITDB_ROOT_PASSWORD: rems-admin-pims-password
     volumes:
-      - pims_remsadmin_mongo:/data/db
+      - rems_dev_pims_remsadmin_mongo:/data/db
       - ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js
 
   crd-request-generator:
@@ -141,7 +141,7 @@ volumes:
 
 
   rems_dev_keycloak-data:
-  pims_remsadmin_mongo:
+  rems_dev_pims_remsadmin_mongo:
   rems_dev_test-ehr-gradle:
   rems_dev_test-ehr-bin:
   rems_dev_test-ehr-build:
diff --git a/docker-compose-m1.yml b/docker-compose-m1.yml
index 9702174d..99f86fb8 100644
--- a/docker-compose-m1.yml
+++ b/docker-compose-m1.yml
@@ -56,23 +56,23 @@ services:
       - "9015:9015" # Bind port 3000 of host to 3000 of container
     environment:
       VSAC_API_KEY: ${VSAC_API_KEY}
-      MONGO_HOSTNAME: mongodb://rems-admin-pims-root:rems-admin-pims-password@pims_remsadmin_mongo:27017
+      MONGO_HOSTNAME: mongodb://rems-user:pass@pims_remsadmin_mongo:27017
 
   pims_remsadmin_mongo:
     image: mongo
-    container_name: rems_dev_pims-remsadmin-mongo
+    container_name: rems_prod_m1_pims-remsadmin-mongo
     ports:
       - '27017:27017' 
     environment:
       MONGO_INITDB_ROOT_USERNAME: rems-admin-pims-root
       MONGO_INITDB_ROOT_PASSWORD: rems-admin-pims-password
     volumes:
-      - pims_remsadmin_mongo:/data/db
+      - rems_prod_m1_pims_remsadmin_mongo:/data/db
       - ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js
 
   pims:
     image: codexrems/pims:REMSvCurrent
-    container_name: rems_dev_pims
+    container_name: rems_prod_m1_pims
     environment:
       REMS_ADMIN_BASE: http://rems-administrator:8090
       MONGO_HOSTNAME: mongodb://pims_remsadmin_mongo:27017/pims
@@ -85,4 +85,5 @@ services:
 
 volumes:
   rems_prod_m1_keycloak-data:
+  rems_prod_m1_pims_remsadmin_mongo:
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 485af4f3..61b134a7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -57,23 +57,23 @@ services:
       - "9015:9015" # Bind port 3000 of host to 3000 of container
     environment:
       VSAC_API_KEY: ${VSAC_API_KEY}
-      MONGO_HOSTNAME: mongodb://rems-admin-pims-root:rems-admin-pims-password@pims_remsadmin_mongo:27017
+      MONGO_HOSTNAME: mongodb://rems-user:pass@pims_remsadmin_mongo:27017
 
   pims_remsadmin_mongo:
     image: mongo
-    container_name: rems_dev_pims-remsadmin-mongo
+    container_name: rems_prod_pims-remsadmin-mongo
     ports:
       - '27017:27017' 
     environment:
       MONGO_INITDB_ROOT_USERNAME: rems-admin-pims-root
       MONGO_INITDB_ROOT_PASSWORD: rems-admin-pims-password
     volumes:
-      - pims_remsadmin_mongo:/data/db
+      - rems_prod_pims_remsadmin_mongo:/data/db
       - ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js
 
   pims:
     image: codexrems/pims:REMSvCurrent
-    container_name: rems_dev_pims
+    container_name: rems_prod_pims
     environment:
       REMS_ADMIN_BASE: http://rems-administrator:8090
       MONGO_HOSTNAME: mongodb://pims_remsadmin_mongo:27017/pims
@@ -86,4 +86,6 @@ services:
 
 volumes:
   rems_prod_keycloak-data:
+  rems_prod_pims_remsadmin_mongo:
+