diff --git a/.github/workflows/UpdateHelmRepo.yml b/.github/workflows/UpdateHelmRepo.yml
index 15ba45e..0e413b7 100644
--- a/.github/workflows/UpdateHelmRepo.yml
+++ b/.github/workflows/UpdateHelmRepo.yml
@@ -1,4 +1,4 @@
-name: Update Helm
+name: Update Helm Packages
 
 on:
   push:
@@ -16,45 +16,33 @@ jobs:
       - name: Set Env
         run: |
           echo "TAG=${GITHUB_REF:11}" >> $GITHUB_ENV
+
       - name: Lint Helm
         uses: WyriHaximus/github-action-helm3@v3.0.1
         with:
-          exec: helm lint ./geoserver && helm lint ./postgis && helm lint ./thredds
+          exec: helm lint ./geoserver && helm lint ./postgis && helm lint ./thredds && helm lint ./gs-cloud
+
       - name: Package GeoServer Helm
         uses: WyriHaximus/github-action-helm3@v3.0.1
         with:
-          exec: helm package ./geoserver
+          exec: helm package ./geoserver -d ./docs
+
       - name: Package Thredds Helm
         uses: WyriHaximus/github-action-helm3@v3.0.1
         with:
-          exec: helm package ./thredds
-      - name: Package PostGIS Helm
-        uses: WyriHaximus/github-action-helm3@v3.0.1
-        with:
-          exec: helm package ./postgis
-      - name: Login to GHCR
-        if: ${{ github.event_name != 'pull_request' }}
-        uses: WyriHaximus/github-action-helm3@v3.0.1
-        with:
-          exec: echo "${{ github.actor }}" | helm registry login -u ${{ secrets.GITHUB_TOKEN }} ghcr.io --password-stdin
-      - name: Push GeoServer Helm Package to GHCR
-        if: ${{ github.event_name != 'pull_request' }}
+          exec: helm package ./thredds -d ./docs
+
+      - name: Package GeoServer Cloud Helm
         uses: WyriHaximus/github-action-helm3@v3.0.1
         with:
-          exec: |
-            export CHART_VERSION=$(grep 'version:' ./geoserver/Chart.yaml | tail -n1 | awk '{ print $2}')
-            helm push geoserver-${CHART_VERSION}.tgz oci://ghcr.io/aquaveo
-      - name: Push Thredds Helm Package to GHCR
-        if: ${{ github.event_name != 'pull_request' }}
+          exec: helm package ./gs-cloud -d ./docs
+
+      - name: Package PostGIS Helm
         uses: WyriHaximus/github-action-helm3@v3.0.1
         with:
-          exec: |
-            export CHART_VERSION=$(grep 'version:' ./thredds/Chart.yaml | tail -n1 | awk '{ print $2}')
-            helm push thredds-${CHART_VERSION}.tgz oci://ghcr.io/aquaveo
-      - name: Push PostGIS Helm Package to GHCR
-        if: ${{ github.event_name != 'pull_request' }}
+          exec: helm package ./postgis -d ./docs
+
+      - name: Update Index yaml file
         uses: WyriHaximus/github-action-helm3@v3.0.1
         with:
-          exec: |
-            export CHART_VERSION=$(grep 'version:' ./postgis/Chart.yaml | tail -n1 | awk '{ print $2}')
-            helm push postgis-${CHART_VERSION}.tgz oci://ghcr.io/aquaveo
+          exec: helm repo index ./docs
diff --git a/.gitignore b/.gitignore
index 56dde6a..5874b77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,6 @@
 *.tar.gz
 *.tar
 # *.tgz
+*-dev.yaml
+*-prod.yaml
+*.lock
diff --git a/docs/gs-cloud-0.1.1.tgz b/docs/gs-cloud-0.1.1.tgz
new file mode 100644
index 0000000..c635e52
Binary files /dev/null and b/docs/gs-cloud-0.1.1.tgz differ
diff --git a/docs/index.yaml b/docs/index.yaml
index 7a2c183..ed5fae3 100644
--- a/docs/index.yaml
+++ b/docs/index.yaml
@@ -3,7 +3,7 @@ entries:
   geoserver:
   - apiVersion: v2
     appVersion: 2.8.2
-    created: "2023-08-01T13:44:41.635181348-06:00"
+    created: "2024-05-26T15:05:32.413871294-06:00"
     description: GeoServer is an open source server for sharing geospatial data.
     digest: c904fd2eadb4f0cac93c983218d8bc351d6b49c0af6b55c5688c4f6913e64ee5
     icon: https://geoserver.org/img/geoserver-logo.png
@@ -14,7 +14,7 @@ entries:
     version: 0.2.2
   - apiVersion: v1
     appVersion: latest
-    created: "2023-08-01T13:44:41.634122502-06:00"
+    created: "2024-05-26T15:05:32.413510211-06:00"
     description: Geoserver
     digest: 54e8f67108f42c169b015770af971486c5c452afa220488d6cb21ab056b1683e
     name: geoserver
@@ -23,17 +23,50 @@ entries:
     version: 0.1.13
   - apiVersion: v1
     appVersion: latest
-    created: "2023-08-01T13:44:41.633425252-06:00"
+    created: "2024-05-26T15:05:32.413175884-06:00"
     description: Geoserver
     digest: 31b4a4441ae2d88d20dcf18d8bbdc9fe81aa4d54f2141293a702a01483f43fda
     name: geoserver
     urls:
     - geoserver-0.1.12.tgz
     version: 0.1.12
+  gs-cloud:
+  - apiVersion: v2
+    appVersion: "1.0"
+    created: "2024-05-26T15:05:32.428613613-06:00"
+    dependencies:
+    - condition: rabbitmq.enabled
+      name: rabbitmq
+      repository: https://charts.bitnami.com/bitnami
+      version: 11.3.0
+    - condition: postgresql.enabled
+      name: postgresql
+      repository: https://charts.bitnami.com/bitnami
+      version: '*'
+    - name: geoservercloud
+      repository: https://camptocamp.github.io/helm-geoserver-cloud
+      version: '*'
+    description: Common dependencies for gscloud
+    digest: 4181c1cdd4e5af31bfe5ed39d4aec43434d6538303ac9229ecdf1a9cb6c7908d
+    name: gs-cloud
+    urls:
+    - gs-cloud-0.1.1.tgz
+    version: 0.1.1
   postgis:
+  - apiVersion: v2
+    appVersion: 12-3.4
+    created: "2024-05-26T15:05:32.429971216-06:00"
+    description: PostgreSQL 12 database with PostGIS 3.4 installed.
+    digest: 0cdafdab057e2b835799bf8c58a9348927f8cf0fad0fedbdd0561ce67852c76c
+    icon: https://postgis.net/logos/postgis-logo-small.png
+    name: postgis
+    type: application
+    urls:
+    - postgis-0.2.3.tgz
+    version: 0.2.3
   - apiVersion: v2
     appVersion: 11-2.5
-    created: "2023-08-01T13:44:41.637342401-06:00"
+    created: "2024-05-26T15:05:32.429636641-06:00"
     description: PostgreSQL 11 database with PostGIS 2.5 installed.
     digest: a2fe70bc9861fd1711ed81189e74bf83deea6b8c8628a77248fb1d4dd10c7482
     icon: https://postgis.net/logos/postgis-logo-small.png
@@ -44,7 +77,7 @@ entries:
     version: 0.2.2
   - apiVersion: v1
     appVersion: latest
-    created: "2023-08-01T13:44:41.636949635-06:00"
+    created: "2024-05-26T15:05:32.429245196-06:00"
     description: PostGIS Database
     digest: cde9235283c6aefbfb121c30aeb39e6812ed063c7b36f09ca81a1f3537605e60
     name: postgis
@@ -53,7 +86,7 @@ entries:
     version: 0.1.13
   - apiVersion: v1
     appVersion: latest
-    created: "2023-08-01T13:44:41.636173588-06:00"
+    created: "2024-05-26T15:05:32.428941589-06:00"
     description: PostGIS Database
     digest: cf63015081eb71403bd06094b530407196f61a94b846852c7297717e5c23f447
     name: postgis
@@ -63,17 +96,17 @@ entries:
   thredds:
   - apiVersion: v2
     appVersion: 1.16.0
-    created: "2023-08-01T13:44:41.638778879-06:00"
+    created: "2024-05-26T15:05:32.430493934-06:00"
     description: The THREDDS Data Server (TDS) provides catalog, metadata, and data
       access services for scientific data. Every TDS publishes THREDDS catalogs that
       advertise the datasets and services it makes available. THREDDS catalogs are
       XML documents that list datasets and the data access services available for
       the datasets
-    digest: 8a26bef848b5c6d5d12e0ee366178e3460187fa0b6bca360bd92f93da27eedfa
+    digest: a559e9ba3c8c8394654151d378429ef2a5195fe021d47097b20bbd83de93ca8d
     icon: https://camo.githubusercontent.com/317090970757210…32f746872656464735f7464732d313530783135302e706e67
     name: thredds
     type: application
     urls:
     - thredds-0.2.3.tgz
     version: 0.2.3
-generated: "2023-08-01T13:44:41.632672427-06:00"
+generated: "2024-05-26T15:05:32.412668343-06:00"
diff --git a/docs/postgis-0.2.3.tgz b/docs/postgis-0.2.3.tgz
new file mode 100644
index 0000000..1eb4303
Binary files /dev/null and b/docs/postgis-0.2.3.tgz differ
diff --git a/docs/thredds-0.2.3.tgz b/docs/thredds-0.2.3.tgz
index 5b54dc4..af16304 100644
Binary files a/docs/thredds-0.2.3.tgz and b/docs/thredds-0.2.3.tgz differ
diff --git a/gs-cloud/Chart.yaml b/gs-cloud/Chart.yaml
index b82f543..0a69ce8 100644
--- a/gs-cloud/Chart.yaml
+++ b/gs-cloud/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: '1.0'
 description: Common dependencies for gscloud
 name: gs-cloud
-version: 0.1.0
+version: 0.1.1
 dependencies:
   - name: 'rabbitmq'
     version: 11.3.0
diff --git a/gs-cloud/charts/geoservercloud-0.1.0.tgz b/gs-cloud/charts/geoservercloud-0.1.0.tgz
new file mode 100644
index 0000000..4ca8fa3
Binary files /dev/null and b/gs-cloud/charts/geoservercloud-0.1.0.tgz differ
diff --git a/gs-cloud/charts/postgresql-13.4.1.tgz b/gs-cloud/charts/postgresql-13.4.1.tgz
new file mode 100644
index 0000000..065459f
Binary files /dev/null and b/gs-cloud/charts/postgresql-13.4.1.tgz differ
diff --git a/gs-cloud/charts/rabbitmq-11.3.0.tgz b/gs-cloud/charts/rabbitmq-11.3.0.tgz
new file mode 100644
index 0000000..ec366a8
Binary files /dev/null and b/gs-cloud/charts/rabbitmq-11.3.0.tgz differ
diff --git a/gs-cloud/values.yaml b/gs-cloud/values.yaml
index 0a0a4b3..9027c12 100644
--- a/gs-cloud/values.yaml
+++ b/gs-cloud/values.yaml
@@ -112,6 +112,14 @@ rabbitmq:
   persistence:
     enabled: false
 
+resources: &common-resources
+  requests:
+    memory: 512Mi
+    cpu: 0.1
+  limits:
+    memory: 4Gi
+    cpu: 4.0
+
 additionalVolumes: &additional-volumes
   datadir:
     persistentVolumeClaim:
@@ -196,6 +204,8 @@ additional-stuff: &additional-stuff
 
   containers:
     spring:
+      resources:
+        <<: *common-resources
       env:
         <<: *env-override
       volumeMounts:
@@ -232,6 +242,7 @@ geoservercloud:
     services:
       gateway:
         service:
+          name: 'gs-cloud-service-gateway'
           annotations: {}
           labels: {}
           <<: *common-service-definition
@@ -251,7 +262,7 @@ geoservercloud:
         initContainers:
           <<: *additional-init-containers
       wms:
-        replicaCount: 2
+        replicaCount: 1
         <<: *additional-stuff
         service:
           <<: *common-service-definition
@@ -264,14 +275,14 @@ geoservercloud:
         initContainers:
           <<: *additional-init-containers
       wfs:
-        replicaCount: 2
+        replicaCount: 1
         <<: *additional-stuff
         service:
           <<: *common-service-definition
         initContainers:
           <<: *additional-init-containers
       gwc:
-        replicaCount: 2
+        replicaCount: 1
         <<: *additional-stuff
         service:
           <<: *common-service-definition
diff --git a/postgis/Chart.yaml b/postgis/Chart.yaml
index e1d2a34..895ae07 100644
--- a/postgis/Chart.yaml
+++ b/postgis/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: 'v2'
-appVersion: '11-2.5'
-description: 'PostgreSQL 11 database with PostGIS 2.5 installed.'
+appVersion: '12-3.4'
+description: 'PostgreSQL 12 database with PostGIS 3.4 installed.'
 icon: https://postgis.net/logos/postgis-logo-small.png
 name: 'postgis'
 type: 'application'
-version: 0.2.2
+version: 0.2.3
diff --git a/postgis/templates/deployment.yaml b/postgis/templates/deployment.yaml
index 4f651c0..35e0820 100755
--- a/postgis/templates/deployment.yaml
+++ b/postgis/templates/deployment.yaml
@@ -85,4 +85,4 @@ spec:
       volumes:
         - name: postgis-persistent-storage
           persistentVolumeClaim:
-            claimName: postgis-pv-claim
+            claimName: {{ .Values.PersistentVolumeClaim.name }}
diff --git a/postgis/templates/pvc.yaml b/postgis/templates/pvc.yaml
index 8c2b5ec..0b0b5a9 100644
--- a/postgis/templates/pvc.yaml
+++ b/postgis/templates/pvc.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: postgis-pv-claim
+  name: {{ .Values.PersistentVolumeClaim.name }}
   labels:
     app.kubernetes.io/name: {{ include "postgis.name" . }}
     helm.sh/chart: {{ include "postgis.chart" . }}
diff --git a/postgis/values.yaml b/postgis/values.yaml
index c2bb71a..8d6758e 100644
--- a/postgis/values.yaml
+++ b/postgis/values.yaml
@@ -6,7 +6,7 @@ replicaCount: 1
 
 image:
   repository: postgis/postgis
-  tag: 11-2.5
+  tag: 12-3.4
   pullPolicy: IfNotPresent
 
 postgres_user: postgres
@@ -51,6 +51,9 @@ service:
 storageClass:
   storageClassName: ''
 
+PersistentVolumeClaim:
+  name: postgis-pv-claim
+
 resources:
   requests:
     cpu: 100m
diff --git a/thredds/templates/service.yaml b/thredds/templates/service.yaml
index 64d9a3a..3646a51 100644
--- a/thredds/templates/service.yaml
+++ b/thredds/templates/service.yaml
@@ -7,9 +7,12 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
-    - name: main-node
-      port: 8080
-      targetPort: 8080
+  {{- range $port := .Values.service.ports }}
+    - name: {{ $port.name }}
+      port: {{ $port.port }}
+      targetPort: {{ $port.targetPort }}
+  {{- end }}
+
   selector:
     app.kubernetes.io/name: {{ include "thredds.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/thredds/values.yaml b/thredds/values.yaml
index 2a053db..c2de404 100644
--- a/thredds/values.yaml
+++ b/thredds/values.yaml
@@ -24,7 +24,10 @@ persistentVolumeClaim:
 service:
   type: ClusterIP
   port: 80
-
+  ports:
+    - name: main-node
+      port: 8080
+      targetPort: 8080
 env:
   - name: TDM_PW
     value: 'tdm_pass'