diff --git a/.secrets.baseline b/.secrets.baseline
index 12bfdfb..5092e59 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -574,29 +574,7 @@
         "line_number": 1136
       }
     ],
-    "devplanetv2/dev-environments/qa-mc2dp-helm/values/values.yaml": [
-      {
-        "type": "Secret Keyword",
-        "filename": "devplanetv2/dev-environments/qa-mc2dp-helm/values/values.yaml",
-        "hashed_secret": "1d751f23f0557dd1daf0c8d87bec7693a213f397",
-        "is_verified": false,
-        "line_number": 591
-      },
-      {
-        "type": "Secret Keyword",
-        "filename": "devplanetv2/dev-environments/qa-mc2dp-helm/values/values.yaml",
-        "hashed_secret": "c7c78012f4993fdc2142b0e7251f557c4e24ca01",
-        "is_verified": false,
-        "line_number": 598
-      },
-      {
-        "type": "Secret Keyword",
-        "filename": "devplanetv2/dev-environments/qa-mc2dp-helm/values/values.yaml",
-        "hashed_secret": "84bc25233d003b8efdd2f8a2b67a4d942c0b63bf",
-        "is_verified": false,
-        "line_number": 601
-      }
-    ],
+
     "devplanetv2/dev-environments/qa-midrc-helm/values/values.yaml": [
       {
         "type": "Secret Keyword",
@@ -759,5 +737,6 @@
       }
     ]
   },
-  "generated_at": "2026-03-16T19:33:34Z"
+  "generated_at": "2026-03-16T20:21:53Z"
+
 }
diff --git a/devplanetv2/dev-environments/qa-mc2dp-helm/values/values.yaml b/devplanetv2/dev-environments/qa-mc2dp-helm/values/values.yaml
index 966a266..21f6d2f 100644
--- a/devplanetv2/dev-environments/qa-mc2dp-helm/values/values.yaml
+++ b/devplanetv2/dev-environments/qa-mc2dp-helm/values/values.yaml
@@ -135,7 +135,8 @@ hatchery:
   replicaCount: 2
   image:
     repository: 707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery
-    tag: "2026.02"
+    # tag: "2026.02"
+    tag: "feat_s3-mount"
   hatchery:
     json: |
       {
@@ -146,6 +147,11 @@ hatchery:
               "workspace_type": "Trial Workspace",
               "local": true
           },
+          "s3-config": {
+            "bucketName": "workspace-software-s3-qa-brh",
+            "prefixBase": "qa-prometheus",
+            "region": "us-east-1"
+          },
           "sidecar": {
               "cpu-limit": "1.0",
               "memory-limit": "256Mi",
@@ -169,6 +175,39 @@ hatchery:
               ]
           },
           "containers": [
+              {
+                "target-port": 8888,
+                "cpu-limit": "2.0",
+                "memory-limit": "8Gi",
+                "name": "(Generic) Software Library Testing",
+                "image": "quay.io/cdis/jupyterlab-generic:master",
+                "env": {
+                  "FRAME_ANCESTORS": "https://qa-prometheus.planx-pla.net"
+                },
+                "args": [
+                  "--ServerApp.base_url=/lw-workspace/proxy/",
+                  "--ServerApp.default_url=/lab",
+                  "--ServerApp.password=''",
+                  "--ServerApp.token=''",
+                  "--ServerApp.notebook_dir='/home/jovyan'",
+                  "--ServerApp.shutdown_no_activity_timeout=3600"
+                ],
+                "command": [
+                  "/jupyterlab-start.sh"
+                ],
+                "path-rewrite": "/lw-workspace/proxy/",
+                "use-tls": "false",
+                "ready-probe": "/lw-workspace/proxy/",
+                "lifecycle-post-start": [
+                  "/bin/sh",
+                  "-c",
+                  "export IAM=`whoami`; rm -rf /home/$IAM/pd/dockerHome; rm -rf /home/$IAM/pd/lost+found; ln -s /data /home/$IAM/; rm /home/$IAM/pd/data; true"
+                ],
+                "user-uid": 1010,
+                "fs-gid": 100,
+                "user-volume-location": "/home/jovyan/pd",
+                "gen3-volume-location": "/home/jovyan/.gen3"
+              },
               {
                   "target-port": 8888,
                   "cpu-limit": "1.0",