diff --git a/files/scripts/psql-fips-fix.sh b/files/scripts/psql-fips-fix.sh
index 82ac5c59f..8cb0ed049 100644
--- a/files/scripts/psql-fips-fix.sh
+++ b/files/scripts/psql-fips-fix.sh
@@ -16,7 +16,7 @@ for name in indexd fence sheepdog peregrine; do
   update_pass $name $username $password
 done
 
-for name in wts metadata gearbox audit arborist access-backend argo_db requestor atlas argo thor; do
+for name in wts metadata gearbox audit arborist access-backend argo_db requestor atlas ohdsi argo thor; do
   if [[ ! -z $(gen3 secrets decode $name-g3auto dbcreds.json) ]]; then
     username=$(gen3 secrets decode $name-g3auto dbcreds.json | jq -r .db_username)
     password=$(gen3 secrets decode $name-g3auto dbcreds.json | jq -r .db_password)
diff --git a/gen3/bin/kube-setup-cluster-level-resources b/gen3/bin/kube-setup-cluster-level-resources
new file mode 100644
index 000000000..f4349398f
--- /dev/null
+++ b/gen3/bin/kube-setup-cluster-level-resources
@@ -0,0 +1,41 @@
+#!/bin/bash
+source "${GEN3_HOME}/gen3/lib/utils.sh"
+gen3_load "gen3/gen3setup"
+
+# Set default value for TARGET_REVISION
+TARGET_REVISION="master"
+
+# Ask for TARGET_REVISION
+read -p "Please provide a target revision for the cluster resources chart (default is master): " user_target_revision
+# If user input is not empty, use it; otherwise, keep the default
+TARGET_REVISION=${user_target_revision:-$TARGET_REVISION}
+
+# Ask for CLUSTER_NAME (no default value)
+read -p "Enter the name of the cluster: " CLUSTER_NAME
+
+# Check if CLUSTER_NAME is provided
+if [ -z "$CLUSTER_NAME" ]; then
+    echo "Error: CLUSTER_NAME cannot be empty."
+    exit 1
+fi
+
+# Create a temporary file
+temp_file=$(mktemp)
+
+# Use sed to replace placeholders in the original file
+sed -e "s|TARGET_REVISION|$TARGET_REVISION|g" \
+    -e "s|CLUSTER_NAME|$CLUSTER_NAME|g" \
+    $GEN3_HOME/kube/services/cluster-level-resources/app.yaml > "$temp_file"
+
+echo "WARNING: Do you have a folder already set up for this environment in gen3-gitops, in the form of <cluster-name>/cluster-values/cluster-values.yaml? If not, this will not work."
+echo ""
+read -n 1 -s -r -p "Press any key to confirm and continue, or Ctrl+C to cancel..."
+echo ""
+
+# Apply the templated file with kubectl
+kubectl apply -f "$temp_file"
+
+# Clean up the temporary file
+rm "$temp_file"
+
+echo "Application has been applied to the cluster."
\ No newline at end of file
diff --git a/gen3/bin/kube-setup-cluster-level-resources.sh b/gen3/bin/kube-setup-cluster-level-resources.sh
new file mode 100644
index 000000000..f4349398f
--- /dev/null
+++ b/gen3/bin/kube-setup-cluster-level-resources.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+source "${GEN3_HOME}/gen3/lib/utils.sh"
+gen3_load "gen3/gen3setup"
+
+# Set default value for TARGET_REVISION
+TARGET_REVISION="master"
+
+# Ask for TARGET_REVISION
+read -p "Please provide a target revision for the cluster resources chart (default is master): " user_target_revision
+# If user input is not empty, use it; otherwise, keep the default
+TARGET_REVISION=${user_target_revision:-$TARGET_REVISION}
+
+# Ask for CLUSTER_NAME (no default value)
+read -p "Enter the name of the cluster: " CLUSTER_NAME
+
+# Check if CLUSTER_NAME is provided
+if [ -z "$CLUSTER_NAME" ]; then
+    echo "Error: CLUSTER_NAME cannot be empty."
+    exit 1
+fi
+
+# Create a temporary file
+temp_file=$(mktemp)
+
+# Use sed to replace placeholders in the original file
+sed -e "s|TARGET_REVISION|$TARGET_REVISION|g" \
+    -e "s|CLUSTER_NAME|$CLUSTER_NAME|g" \
+    $GEN3_HOME/kube/services/cluster-level-resources/app.yaml > "$temp_file"
+
+echo "WARNING: Do you have a folder already set up for this environment in gen3-gitops, in the form of <cluster-name>/cluster-values/cluster-values.yaml? If not, this will not work."
+echo ""
+read -n 1 -s -r -p "Press any key to confirm and continue, or Ctrl+C to cancel..."
+echo ""
+
+# Apply the templated file with kubectl
+kubectl apply -f "$temp_file"
+
+# Clean up the temporary file
+rm "$temp_file"
+
+echo "Application has been applied to the cluster."
\ No newline at end of file
diff --git a/kube/services/cluster-level-resources/app.yaml b/kube/services/cluster-level-resources/app.yaml
new file mode 100644
index 000000000..95a2ed4c4
--- /dev/null
+++ b/kube/services/cluster-level-resources/app.yaml
@@ -0,0 +1,21 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: cluster-level-resources
+  namespace: argocd
+spec:
+  project: default
+  destination:
+    namespace: argocd
+    server: https://kubernetes.default.svc
+  source:
+    repoURL: https://github.com/uc-cdis/gen3-gitops.git
+    targetRevision: TARGET_REVISION
+    path: cluster-level-resources
+    helm:
+      valueFiles:
+        - ../CLUSTER_NAME/cluster-values/cluster-values.yaml
+      releaseName: cluster-level-resources
+  syncPolicy:
+    automated:
+      selfHeal: true