diff --git a/app-infrastructure/configs/README.md b/app-infrastructure/configs/README.md
new file mode 100644
index 0000000..fe82ecc
--- /dev/null
+++ b/app-infrastructure/configs/README.md
@@ -0,0 +1,5 @@
+## Additional Information about WildFly Configuration
+There is no module.xml in this repository. It has been moved to the [pic-sure-wildfly-docker repository](https://github.com/hms-dbmi/pic-sure-wildfly-docker).
+The `module.xml` is created dynamically by the `generate-module-xml.sh` script in the pic-sure-wildfly-docker repository. This script is run when the
+`pic-sure-with-aggregate-resource.Dockerfile` is built. The module.xml is created based on the jars copied into the 
+`opt/jboss/wildfly/modules/system/layers/base/com/sql/mysql/main/` directory in the docker image.
\ No newline at end of file
diff --git a/app-infrastructure/configs/standalone.xml b/app-infrastructure/configs/standalone.xml
index 25d0473..1bdda76 100644
--- a/app-infrastructure/configs/standalone.xml
+++ b/app-infrastructure/configs/standalone.xml
@@ -164,17 +164,16 @@
                 </datasource>
                 <datasource jndi-name="java:jboss/datasources/AuthDS" pool-name="AuthDS" use-java-context="true">
                     <connection-url>
-                        jdbc:mysql://${picsure-db-host}/auth?useUnicode=true&amp;characterEncoding=UTF-8&amp;autoReconnect=true&amp;autoReconnectForPools=true
+                        jdbc-secretsmanager:mysql://${picsure-db-host}/auth?useUnicode=true&amp;characterEncoding=UTF-8&amp;autoReconnect=true&amp;autoReconnectForPools=true
                     </connection-url>
-                    <driver>mysql</driver>
+                    <driver>aws-secretsmanager-mysql</driver>
                     <pool>
                         <min-pool-size>2</min-pool-size>
                         <max-pool-size>10</max-pool-size>
                         <prefill>true</prefill>
                     </pool>
                     <security>
-                        <user-name>${picsure-db-username}</user-name>
-                        <password>${picsure-db-password}</password>
+                        <user-name>${app_user_secret_name}</user-name>
                     </security>
                     <validation>
                         <valid-connection-checker
@@ -188,17 +187,16 @@
                 </datasource>
                 <datasource jndi-name="java:jboss/datasources/PicsureDS" pool-name="PicsureDS" use-java-context="true">
                     <connection-url>
-                        jdbc:mysql://${picsure-db-host}/picsure?useUnicode=true&amp;characterEncoding=UTF-8&amp;autoReconnect=true&amp;autoReconnectForPools=true
+                        jdbc-secretsmanager:mysql://${picsure-db-host}/picsure?useUnicode=true&amp;characterEncoding=UTF-8&amp;autoReconnect=true&amp;autoReconnectForPools=true
                     </connection-url>
-                    <driver>mysql</driver>
+                    <driver>aws-secretsmanager-mysql</driver>
                     <pool>
                         <min-pool-size>3</min-pool-size>
                         <max-pool-size>10</max-pool-size>
                         <prefill>true</prefill>
                     </pool>
                     <security>
-                        <user-name>${picsure-db-username}</user-name>
-                        <password>${picsure-db-password}</password>
+                        <user-name>${app_user_secret_name}</user-name>
                     </security>
                     <validation>
                         <valid-connection-checker
@@ -217,6 +215,9 @@
                     <driver name="h2" module="com.h2database.h2">
                         <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
                     </driver>
+                    <driver name="aws-secretsmanager-mysql" module="com.sql.mysql">
+                        <driver-class>com.amazonaws.secretsmanager.sql.AWSSecretsManagerMySQLDriver</driver-class>
+                    </driver>
                 </drivers>
             </datasources>
         </subsystem>
diff --git a/app-infrastructure/configs/wildfly_mysql_module.xml b/app-infrastructure/configs/wildfly_mysql_module.xml
deleted file mode 100644
index cae67ca..0000000
--- a/app-infrastructure/configs/wildfly_mysql_module.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<module xmlns="urn:jboss:module:1.1" name="com.sql.mysql">
-<resources>
-<resource-root path="mysql-connector-j-8.0.33.jar"/>
-</resources>
-<dependencies>
-<module name="javax.api"/>
-</dependencies>
-</module>
\ No newline at end of file
diff --git a/app-infrastructure/mysql-connector-j-8.0.33.jar b/app-infrastructure/mysql-connector-j-8.0.33.jar
deleted file mode 100644
index 3f741f5..0000000
Binary files a/app-infrastructure/mysql-connector-j-8.0.33.jar and /dev/null differ
diff --git a/app-infrastructure/s3_roles.tf b/app-infrastructure/s3_roles.tf
index 21d476b..f69fc23 100644
--- a/app-infrastructure/s3_roles.tf
+++ b/app-infrastructure/s3_roles.tf
@@ -1,121 +1,3 @@
-
-resource "aws_iam_instance_profile" "wildfly-deployment-s3-profile" {
-  name = "wildfly-deployment-s3-profile-${var.target_stack}-${local.uniq_name}"
-  role = aws_iam_role.wildfly-deployment-s3-role.name
-}
-
-resource "aws_iam_role_policy" "wildfly-deployment-s3-policy" {
-  name   = "wildfly-deployment-s3-policy-${var.target_stack}-${local.uniq_name}"
-  role   = aws_iam_role.wildfly-deployment-s3-role.id
-  policy = <<EOF
-{
-  "Version": "2012-10-17",
-  "Statement": [
-    {
-      "Action": [
-        "s3:GetObject"
-      ],
-      "Effect": "Allow",
-      "Resource": "arn:aws:s3:::${var.stack_s3_bucket}/releases/jenkins_pipeline_build_${var.stack_githash_long}/pic-sure-wildfly.tar.gz"
-    },{
-      "Action": [
-        "s3:GetObject"
-      ],
-      "Effect": "Allow",
-      "Resource": "arn:aws:s3:::${var.stack_s3_bucket}/configs/jenkins_pipeline_build_${var.stack_githash_long}/visualization-resource.properties"
-    },{
-      "Action": [
-        "s3:GetObject"
-      ],
-      "Effect": "Allow",
-      "Resource": "arn:aws:s3:::${var.stack_s3_bucket}/data/${var.dataset_s3_object_key}/fence_mapping.json"
-    },{
-      "Action": [
-        "s3:GetObject"
-      ],
-      "Effect": "Allow",
-      "Resource": "arn:aws:s3:::${var.stack_s3_bucket}/configs/jenkins_pipeline_build_${var.stack_githash_long}/standalone.xml"
-    },{
-      "Action": [
-        "s3:GetObject"
-      ],
-      "Effect": "Allow",
-      "Resource": "arn:aws:s3:::${var.stack_s3_bucket}/configs/jenkins_pipeline_build_${var.stack_githash_long}/*"
-    },{
-      "Action": [
-        "s3:GetObject"
-      ],
-      "Effect": "Allow",
-      "Resource": "arn:aws:s3:::${var.stack_s3_bucket}/configs/jenkins_pipeline_build_${var.stack_githash_long}/aggregate-resource.properties"
-    },{
-      "Action": [
-        "s3:GetObject"
-      ],
-      "Effect": "Allow",
-      "Resource": "arn:aws:s3:::${var.stack_s3_bucket}/configs/jenkins_pipeline_build_${var.stack_githash_long}/aggregate-resource.properties"
-    },{
-      "Action": [
-        "s3:GetObject"
-      ],
-      "Effect": "Allow",
-      "Resource": "arn:aws:s3:::${var.stack_s3_bucket}/modules/*"
-    },{
-      "Action": [
-        "s3:ListBucket"
-      ],
-      "Effect": "Allow",
-      "Resource": "arn:aws:s3:::${var.stack_s3_bucket}",
-      "Condition": {
-        "StringLike": {
-          "s3:prefix": [
-            "releases/jenkins_pipeline_build_${var.stack_githash_long}/*",
-            "configs/jenkins_pipeline_build_${var.stack_githash_long}*",
-            "modules/*",
-            "data/${var.dataset_s3_object_key}/*"
-          ]
-        }
-      }
-    },{
-      "Action": [
-        "ec2:CreateTags"
-      ],
-      "Effect": "Allow",
-      "Resource": "arn:aws:ec2:*:*:instance/*"
-    }
-  ]
-}
-EOF
-}
-
-resource "aws_iam_role" "wildfly-deployment-s3-role" {
-  name               = "${local.project_no_space}-wildfly-deployment-s3-role-${var.target_stack}-${local.uniq_name}"
-  assume_role_policy = <<EOF
-{
-  "Version": "2012-10-17",
-  "Statement": [
-    {
-      "Action": "sts:AssumeRole",
-      "Principal": {
-        "Service": "ec2.amazonaws.com"
-      },
-      "Effect": "Allow",
-      "Sid": ""
-    }
-  ]
-}
-EOF
-}
-
-resource "aws_iam_role_policy_attachment" "attach-cloudwatch-server-policy-to-wildfly-role" {
-  role       = aws_iam_role.wildfly-deployment-s3-role.name
-  policy_arn = "arn:aws:iam::aws:policy/CloudWatchAgentServerPolicy"
-}
-resource "aws_iam_role_policy_attachment" "attach-cloudwatch-ssm-policy-to-wildfly-role" {
-  role       = aws_iam_role.wildfly-deployment-s3-role.name
-  policy_arn = "arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore"
-}
-
-
 resource "aws_iam_instance_profile" "httpd-deployment-s3-profile" {
   name = "httpd-deployment-s3-profile-${var.target_stack}-${local.uniq_name}"
   role = aws_iam_role.httpd-deployment-s3-role.name
diff --git a/app-infrastructure/scripts/wildfly-user_data.sh b/app-infrastructure/scripts/wildfly-user_data.sh
index 4ef0d76..7ce6362 100644
--- a/app-infrastructure/scripts/wildfly-user_data.sh
+++ b/app-infrastructure/scripts/wildfly-user_data.sh
@@ -33,8 +33,6 @@ sleep 600
 
 s3_copy s3://${stack_s3_bucket}/releases/jenkins_pipeline_build_${stack_githash}/pic-sure-wildfly.tar.gz /home/centos/pic-sure-wildfly.tar.gz
 s3_copy s3://${stack_s3_bucket}/configs/jenkins_pipeline_build_${stack_githash}/standalone.xml /home/centos/standalone.xml
-s3_copy s3://${stack_s3_bucket}/modules/mysql/module.xml /home/centos/mysql_module.xml
-s3_copy s3://${stack_s3_bucket}/modules/mysql/mysql-connector-j-8.0.33.jar /home/centos/mysql-connector-j-8.0.33.jar
 s3_copy s3://${stack_s3_bucket}/data/${dataset_s3_object_key}/fence_mapping.json /home/centos/fence_mapping.json
 s3_copy s3://${stack_s3_bucket}/configs/jenkins_pipeline_build_${stack_githash}/aggregate-resource.properties /home/centos/aggregate-resource.properties
 s3_copy s3://${stack_s3_bucket}/configs/jenkins_pipeline_build_${stack_githash}/visualization-resource.properties /home/centos/visualization-resource.properties
@@ -51,8 +49,6 @@ sudo docker run -u root --name=wildfly \
                         -v /home/centos/standalone.xml:/opt/jboss/wildfly/standalone/configuration/standalone.xml \
                         -v /home/centos/fence_mapping.json:/usr/local/docker-config/fence_mapping.json \
                         -v /home/centos/aggregate-resource.properties:/opt/jboss/wildfly/standalone/configuration/aggregate-data-sharing/pic-sure-aggregate-resource/resource.properties \
-                        -v /home/centos/mysql_module.xml:/opt/jboss/wildfly/modules/system/layers/base/com/sql/mysql/main/module.xml  \
-                        -v /home/centos/mysql-connector-j-8.0.33.jar:/opt/jboss/wildfly/modules/system/layers/base/com/sql/mysql/main/mysql-connector-j-8.0.33.jar \
                         -v /var/log/wildfly-docker-os-logs/:/var/log/ \
                         -v /home/centos/visualization-resource.properties:/opt/jboss/wildfly/standalone/configuration/visualization/pic-sure-visualization-resource/resource.properties \
                         -p 8080:8080 -e JAVA_OPTS="$JAVA_OPTS" -d $WILDFLY_IMAGE
diff --git a/app-infrastructure/variables.tf b/app-infrastructure/variables.tf
index ede569b..2e42cf8 100644
--- a/app-infrastructure/variables.tf
+++ b/app-infrastructure/variables.tf
@@ -203,5 +203,14 @@ variable "referer_allowed_domains" {
 variable "pic_sure_resource_id" {
     type = string
     description = "The resource id for the pic-sure. Used for auth or open HPDS generally"
+}
 
+variable "app_acct_id" {
+    type = string
+    description = "The account id for the application"
+}
+
+variable "app_user_secret_name" {
+    type = string
+    description = "The secret name for the application user"
 }
\ No newline at end of file
diff --git a/app-infrastructure/wildfly-iam.tf b/app-infrastructure/wildfly-iam.tf
new file mode 100644
index 0000000..77d1776
--- /dev/null
+++ b/app-infrastructure/wildfly-iam.tf
@@ -0,0 +1,139 @@
+data "aws_region" "current" {}
+
+resource "aws_iam_instance_profile" "wildfly-deployment-profile" {
+  name = "wildfly-deployment-profile-${var.target_stack}-${local.uniq_name}"
+  role = aws_iam_role.wildfly-deployment-role.name
+}
+
+resource "aws_iam_role" "wildfly-deployment-role" {
+  name               = "${local.project_no_space}-wildfly-deployment-role-${var.target_stack}-${local.uniq_name}"
+  assume_role_policy = <<EOF
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Action": "sts:AssumeRole",
+      "Principal": {
+        "Service": "ec2.amazonaws.com"
+      },
+      "Effect": "Allow",
+      "Sid": ""
+    }
+  ]
+}
+EOF
+}
+
+resource "aws_iam_role_policy" "wildfly-deployment-sm-policy" {
+  name   = "wildfly-deployment-sm-policy-${var.target_stack}-${local.uniq_name}"
+  role   = aws_iam_role.wildfly-deployment-role.id
+  policy = <<EOF
+{
+  "Version": "2012-10-17",
+  "Statement": [
+      {
+      "Action": [
+          "secretsmanager:GetSecretValue",
+          "secretsmanager:DescribeSecret"
+      ],
+      "Effect": "Allow",
+      "Resource": "arn:aws:secretsmanager:${data.aws_region.current.name}:${var.app_acct_id}:secret:${var.app_user_secret_name}-*"
+      }
+    ]
+}
+EOF
+}
+
+resource "aws_iam_role_policy_attachment" "attach-cloudwatch-server-policy-to-sm-role" {
+  role       = aws_iam_role.wildfly-deployment-role.name
+  policy_arn = "arn:aws:iam::aws:policy/CloudWatchAgentServerPolicy"
+}
+
+resource "aws_iam_role_policy_attachment" "attach-cloudwatch-ssm-policy-to-sm-role" {
+  role       = aws_iam_role.wildfly-deployment-role.name
+  policy_arn = "arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore"
+}
+
+resource "aws_iam_role_policy" "wildfly-deployment-s3-policy" {
+  name   = "wildfly-deployment-s3-policy-${var.target_stack}-${local.uniq_name}"
+  role   = aws_iam_role.wildfly-deployment-role.id
+  policy = <<EOF
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Action": [
+        "s3:GetObject"
+      ],
+      "Effect": "Allow",
+      "Resource": "arn:aws:s3:::${var.stack_s3_bucket}/releases/jenkins_pipeline_build_${var.stack_githash_long}/pic-sure-wildfly.tar.gz"
+    },{
+      "Action": [
+        "s3:GetObject"
+      ],
+      "Effect": "Allow",
+      "Resource": "arn:aws:s3:::${var.stack_s3_bucket}/configs/jenkins_pipeline_build_${var.stack_githash_long}/visualization-resource.properties"
+    },{
+      "Action": [
+        "s3:GetObject"
+      ],
+      "Effect": "Allow",
+      "Resource": "arn:aws:s3:::${var.stack_s3_bucket}/data/${var.dataset_s3_object_key}/fence_mapping.json"
+    },{
+      "Action": [
+        "s3:GetObject"
+      ],
+      "Effect": "Allow",
+      "Resource": "arn:aws:s3:::${var.stack_s3_bucket}/configs/jenkins_pipeline_build_${var.stack_githash_long}/standalone.xml"
+    },{
+      "Action": [
+        "s3:GetObject"
+      ],
+      "Effect": "Allow",
+      "Resource": "arn:aws:s3:::${var.stack_s3_bucket}/configs/jenkins_pipeline_build_${var.stack_githash_long}/*"
+    },{
+      "Action": [
+        "s3:GetObject"
+      ],
+      "Effect": "Allow",
+      "Resource": "arn:aws:s3:::${var.stack_s3_bucket}/configs/jenkins_pipeline_build_${var.stack_githash_long}/aggregate-resource.properties"
+    },{
+      "Action": [
+        "s3:GetObject"
+      ],
+      "Effect": "Allow",
+      "Resource": "arn:aws:s3:::${var.stack_s3_bucket}/configs/jenkins_pipeline_build_${var.stack_githash_long}/aggregate-resource.properties"
+    },{
+      "Action": [
+        "s3:GetObject"
+      ],
+      "Effect": "Allow",
+      "Resource": "arn:aws:s3:::${var.stack_s3_bucket}/modules/*"
+    },{
+      "Action": [
+        "s3:ListBucket"
+      ],
+      "Effect": "Allow",
+      "Resource": "arn:aws:s3:::${var.stack_s3_bucket}",
+      "Condition": {
+        "StringLike": {
+          "s3:prefix": [
+            "releases/jenkins_pipeline_build_${var.stack_githash_long}/*",
+            "configs/jenkins_pipeline_build_${var.stack_githash_long}*",
+            "modules/*",
+            "data/${var.dataset_s3_object_key}/*"
+          ]
+        }
+      }
+    },{
+      "Action": [
+        "ec2:CreateTags"
+      ],
+      "Effect": "Allow",
+      "Resource": "arn:aws:ec2:*:*:instance/*"
+    }
+  ]
+}
+EOF
+}
+
diff --git a/app-infrastructure/wildfly-instance.tf b/app-infrastructure/wildfly-instance.tf
index 44c4e61..f25e1ad 100644
--- a/app-infrastructure/wildfly-instance.tf
+++ b/app-infrastructure/wildfly-instance.tf
@@ -1,12 +1,12 @@
 data "template_file" "wildfly-user_data" {
   template = file("scripts/wildfly-user_data.sh")
   vars     = {
-    stack_githash           = var.stack_githash_long
-    stack_s3_bucket         = var.stack_s3_bucket
-    dataset_s3_object_key   = var.dataset_s3_object_key
-    target_stack            = var.target_stack
-    gss_prefix              = "${var.environment_prefix}_${var.env_is_open_access ? "open" : "auth"}_${var.environment_name}"
-    env_private_dns_name    = var.env_private_dns_name
+    stack_githash         = var.stack_githash_long
+    stack_s3_bucket       = var.stack_s3_bucket
+    dataset_s3_object_key = var.dataset_s3_object_key
+    target_stack          = var.target_stack
+    gss_prefix            = "${var.environment_prefix}_${var.env_is_open_access ? "open" : "auth"}_${var.environment_name}"
+    env_private_dns_name  = var.env_private_dns_name
   }
 }
 
@@ -27,7 +27,7 @@ resource "aws_instance" "wildfly-ec2" {
 
   subnet_id = local.private2_subnet_ids[0]
 
-  iam_instance_profile = "wildfly-deployment-s3-profile-${var.target_stack}-${local.uniq_name}"
+  iam_instance_profile = "wildfly-deployment-profile-${var.target_stack}-${local.uniq_name}"
 
   user_data = data.template_cloudinit_config.wildfly-user-data.rendered
 
@@ -77,6 +77,7 @@ data "template_file" "wildfly-standalone-xml" {
     client_id                         = var.client_id
     sp_client_secret                  = var.sp_client_secret
     connection_id                     = var.connection_id
+    app_user_secret_name              = var.app_user_secret_name
   }
 }
 
@@ -101,7 +102,7 @@ resource "local_file" "aggregate-resource-properties-file" {
 data "template_file" "visualization-resource-properties" {
   template = file("configs/visualization-resource.properties")
   vars     = {
-    target_stack                      = var.target_stack
+    target_stack = var.target_stack
   }
 }