diff --git a/REMS.code-workspace b/REMS.code-workspace
index c41f22c..34b220d 100644
--- a/REMS.code-workspace
+++ b/REMS.code-workspace
@@ -463,7 +463,8 @@
       "Winterfell",
       "Wiseman",
       "zoneinfo"
-    ]
+    ],
+    "java.compile.nullAnalysis.mode": "automatic"
   },
   "extensions": {
     "recommendations": [
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index a534b65..ccf9591 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -94,6 +94,23 @@ services:
       - rems_dev_rems-admin-nodeModules:/rems-admin/node_modules
       - rems_dev_rems-admin-logs:/rems-admin/logs
 
+  rems-administrator2:
+    build:
+      context: '../rems-admin'
+      dockerfile: Dockerfile.dev
+    container_name: rems_dev_rems-administrator2
+    ports:
+      - "8095:8095"
+      - "8096:8096"
+    environment:
+      VSAC_API_KEY: ${VSAC_API_KEY}
+      MONGO_URL: mongodb://rems-user:pass@pims_remsadmin_mongo:27017
+      PORT: 8095
+    volumes:
+      - rems_dev_rems-admin2-sync:/rems-admin2:nocopy #  nocopy is important
+      - rems_dev_rems-admin2-nodeModules:/rems-admin2/node_modules
+      - rems_dev_rems-admin2-logs:/rems-admin2/logs
+
   pims:
     build:
       context: ../pims
@@ -131,6 +148,8 @@ volumes:
     external: true
   rems_dev_rems-admin-sync:
     external: true
+  rems_dev_rems-admin2-sync:
+    external: true
   rems_dev_pims-sync:
     external: true
   rems_dev_rems-smart-on-fhir-sync:
@@ -155,6 +174,8 @@ volumes:
   rems_dev_pims-backend-dist:
   rems_dev_rems-admin-nodeModules:
   rems_dev_rems-admin-logs:
+  rems_dev_rems-admin2-nodeModules:
+  rems_dev_rems-admin2-logs:
   rems_dev_rems-smart-on-fhir-nodeModules:
   rems_dev_rems-smart-on-fhir-logs:
   rems_dev_rems-intermediary-nodeModules:
diff --git a/docker-compose-local-build.yml b/docker-compose-local-build.yml
index 3d24db4..b64e713 100644
--- a/docker-compose-local-build.yml
+++ b/docker-compose-local-build.yml
@@ -71,6 +71,18 @@ services:
       VSAC_API_KEY: ${VSAC_API_KEY}
       MONGO_URL: mongodb://rems-user:pass@pims_remsadmin_mongo:27017
 
+  rems-administrator2:
+    build:
+      context: '../rems-admin'
+    container_name: rems_dev_rems-administrator2
+    ports:
+      - "8095:8095"
+      - "8096:8096"
+    environment:
+      VSAC_API_KEY: ${VSAC_API_KEY}
+      MONGO_URL: mongodb://rems-user:pass@pims_remsadmin_mongo:27017
+      PORT: 8095
+
   pims:
     build:
       context: ../pims
diff --git a/docker-compose.yml b/docker-compose.yml
index b70a445..21d426b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -46,13 +46,23 @@ services:
   # Create rems container
   rems-administrator: # Name of our service
     image: codexrems/rems-administrator:1.1
-    container_name: rems_prod_rems
+    container_name: rems_prod_rems-administrator
     ports: # Port binding to host from docker container
       - "8090:8090"
     environment:
       VSAC_API_KEY: ${VSAC_API_KEY}
       MONGO_URL: mongodb://rems-user:pass@pims_remsadmin_mongo:27017
 
+  rems-administrator2: # Name of our service
+    image: codexrems/rems-administrator:1.1
+    container_name: rems_prod_rems-administrator2
+    ports: # Port binding to host from docker container
+      - "8095:8095"
+    environment:
+      VSAC_API_KEY: ${VSAC_API_KEY}
+      MONGO_URL: mongodb://rems-user:pass@pims_remsadmin_mongo:27017
+      PORT: 8095
+
   # Create pims admin container
   pims_remsadmin_mongo:
     image: mongo
diff --git a/docker-sync.yml b/docker-sync.yml
index 72a7100..4240866 100644
--- a/docker-sync.yml
+++ b/docker-sync.yml
@@ -19,6 +19,11 @@ syncs:
     src: '../rems-admin'
     sync_excludes: ['node_modules']
 
+  rems_dev_rems-admin2-sync:
+    src: '../rems-admin'
+    sync_excludes: ['node_modules']
+
+
   rems_dev_pims-sync:  
     src: '../pims'
     sync_excludes: ['./frontend/node_modules', './backend/node_modules', './backend/dist']